mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #5179 from basepi/retcode5112
Remove retcode arg from cmd._run, Fix #5112
This commit is contained in:
commit
65234c01e2
1 changed files with 0 additions and 10 deletions
|
@ -162,7 +162,6 @@ def _run(cmd,
|
|||
shell=DEFAULT_SHELL,
|
||||
env=(),
|
||||
rstrip=True,
|
||||
retcode=False,
|
||||
template=None,
|
||||
umask=None):
|
||||
'''
|
||||
|
@ -295,12 +294,6 @@ def _run(cmd,
|
|||
kwargs['executable'] = shell
|
||||
kwargs['close_fds'] = True
|
||||
|
||||
# Setting stdout to None seems to cause the Process to fail.
|
||||
# See bug #2640 for more info
|
||||
#if retcode:
|
||||
#kwargs['stdout'] = None
|
||||
#kwargs['stderr'] = None
|
||||
|
||||
# This is where the magic happens
|
||||
proc = subprocess.Popen(cmd, **kwargs)
|
||||
out, err = proc.communicate()
|
||||
|
@ -556,7 +549,6 @@ def retcode(cmd,
|
|||
cwd=cwd,
|
||||
shell=shell,
|
||||
env=env,
|
||||
retcode=True,
|
||||
template=template,
|
||||
umask=umask,
|
||||
quiet=quiet)['retcode']
|
||||
|
@ -607,7 +599,6 @@ def script(
|
|||
quiet=kwargs.get('quiet', False),
|
||||
runas=runas,
|
||||
shell=shell,
|
||||
retcode=kwargs.get('retcode', False),
|
||||
umask=umask
|
||||
)
|
||||
os.remove(path)
|
||||
|
@ -646,7 +637,6 @@ def script_retcode(
|
|||
shell,
|
||||
env,
|
||||
template,
|
||||
retcode=True,
|
||||
umask=umask,
|
||||
**kwargs)['retcode']
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue