valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

@kiorky please finish cleaning up the double quotes sometime

Browse Source 
It is nice to keep the style clean, also, do we need the Logger
class? why can't we just use the salt logging? or am I missing
something?
This commit is contained in:
Thomas S Hatch 2013-12-03 11:46:52 -07:00
parent 4e377c1cf3
commit b710fbb759
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/zcbuildout.py
View File

@ -33,24 +33,15 @@ def __virtual__():
return __virtualname__ return __virtualname__
return False return False
from threading import Thread
import copy
import fcntl
import logging
import os import os
import pkg_resources
import re import re
import shutil
import subprocess
import sys import sys
import traceback import traceback
import urllib2 import urllib2
from salt.modules import cmdmod
from salt.exceptions import CommandExecutionError from salt.exceptions import CommandExecutionError
from salt._compat import string_types from salt._compat import string_types
import salt.utils
from salt.utils.odict import OrderedDict
INVALID_RESPONSE = 'We did not get any expectable answer from buildout' INVALID_RESPONSE = 'We did not get any expectable answer from buildout'
@ -218,7 +209,8 @@ def _Popen(command,
runas=None, runas=None,
env=(), env=(),
exitcode=0): exitcode=0):
"""Run a command '''
Run a command
output output
return output if true return output if true
directory directory
@ -231,7 +223,7 @@ def _Popen(command,
fails if cmd does not return this exit code fails if cmd does not return this exit code
(set to None to disable check) (set to None to disable check)
""" '''
ret = None ret = None
directory = os.path.abspath(directory) directory = os.path.abspath(directory)
if isinstance(command, list): if isinstance(command, list):
@ -248,15 +240,15 @@ def _Popen(command,
class ResultTransmission(Exception): class ResultTransmission(Exception):
"""General Buildout Error.""" '''General Buildout Error.'''
class BuildoutError(CommandExecutionError): class BuildoutError(CommandExecutionError):
"""General Buildout Error.""" '''General Buildout Error.'''
class MrDeveloperError(BuildoutError): class MrDeveloperError(BuildoutError):
"""Arrives when mr.developer fails""" '''Arrives when mr.developer fails'''
def _has_old_distribute(python=sys.executable, runas=None, env=()): def _has_old_distribute(python=sys.executable, runas=None, env=()):