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

lint

Browse Source
This commit is contained in:
Thomas S Hatch 2014-10-13 08:44:40 -06:00
parent 985ec7c05e
commit 9e879a1d91
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/client/ssh/shell.py
View File

@ -349,7 +349,7 @@ class Shell(object):
'flag:\n{0}').format(stdout) 'flag:\n{0}').format(stdout)
return ret_stdout, '', 254 return ret_stdout, '', 254
elif stdout and stdout.endswith('_||ext_mods||_'): elif stdout and stdout.endswith('_||ext_mods||_'):
mods_raw = json.dumps(self.mods, separators=(',',':')) + '|_E|0|' mods_raw = json.dumps(self.mods, separators=(',', ':')) + '|_E|0|'
term.sendline(mods_raw) term.sendline(mods_raw)
if not term.isalive(): if not term.isalive():
while True: while True:

4
salt/client/ssh/ssh_py_shim.py
View File

@ -23,6 +23,7 @@ THIN_ARCHIVE = 'salt-thin.tgz'
EX_THIN_DEPLOY = 11 EX_THIN_DEPLOY = 11
EX_THIN_CHECKSUM = 12 EX_THIN_CHECKSUM = 12
class OBJ(object): class OBJ(object):
pass pass
@ -30,6 +31,7 @@ OPTIONS = None
ARGS = None ARGS = None
#%%OPTS #%%OPTS
def need_deployment(): def need_deployment():
if os.path.exists(OPTIONS.saltdir): if os.path.exists(OPTIONS.saltdir):
shutil.rmtree(OPTIONS.saltdir) shutil.rmtree(OPTIONS.saltdir)
@ -77,6 +79,7 @@ def unpack_thin(thin_path):
tfile.close() tfile.close()
os.unlink(thin_path) os.unlink(thin_path)
def get_modules(): def get_modules():
glob = '' glob = ''
while True: while True:
@ -88,6 +91,7 @@ def get_modules():
ext_mods = json.loads(glob[:-6]) ext_mods = json.loads(glob[:-6])
write_modules(ext_mods) write_modules(ext_mods)
def write_modules(ext_mods): def write_modules(ext_mods):
modcache = os.path.join( modcache = os.path.join(
OPTIONS.saltdir, OPTIONS.saltdir,