saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid shadowing variables in lxc module

Browse source 
lxc.run_cmd was shadowing `stdout` and `stderr` arguments with local
variables. Those arguments allow to change format of returned value and
shadowing resulted in lxc.cmd_run returning value in wrong format when
command didn't produce any output or errors.
This commit is contained in:
cellscape 2015-05-08 12:30:39 +06:00
parent 792e1021f2
commit 2d9aa2bb97
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/lxc.py
View file

@ -2164,7 +2164,7 @@ def run_cmd(name, cmd, no_start=False, preserve_state=True,
if not use_vt:
res = __salt__['cmd.run_all'](cmd, python_shell=False)
else:
stdout, stderr = '', ''
stdout_str, stderr_str = '', ''
try:
proc = vt.Terminal(cmd,
shell=True,
@ -2184,33 +2184,33 @@ def run_cmd(name, cmd, no_start=False, preserve_state=True,
except IOError:
cstdout, cstderr = '', ''
if cstdout:
stdout += cstdout
stdout_str += cstdout
else:
cstdout = ''
if cstderr:
stderr += cstderr
stderr_str += cstderr
else:
cstderr = ''
# done by vt itself
# if stdout:
# log.debug(stdout)
# log.debug(stdout_str)
# if stderr:
# log.debug(stderr)
# log.debug(stderr_str)
if not cstdout and not cstderr and not proc.isalive():
break
except KeyboardInterrupt:
break
res = {'retcode': proc.exitstatus,
'pid': 2,
'stdout': stdout,
'stderr': stderr}
'stdout': stdout_str,
'stderr': stderr_str}
except vt.TerminalException:
trace = traceback.format_exc()
log.error(trace)
res = {'retcode': 127,
'pid': '2',
'stdout': stdout,
'stderr': stderr}
'stdout': stdout_str,
'stderr': stderr_str}
finally:
proc.terminate()
else: