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

cmd run: when running in bg, force ignore_retcode=True

Browse source
This commit is contained in:
Ronald van Zantvoort 2018-02-08 20:33:31 +01:00
parent 0cbe93cd69
commit ebb1f81a9b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/cmdmod.py
View file

@ -317,6 +317,9 @@ def _run(cmd,
# yaml-ified into non-string types
cwd = str(cwd)
if bg:
ignore_retcode = True
if not salt.utils.is_windows():
if not os.path.isfile(shell) or not os.access(shell, os.X_OK):
msg = 'The shell {0} is not available'.format(shell)
@ -3118,7 +3121,6 @@ def run_bg(cmd,
output_loglevel='debug',
log_callback=None,
reset_system_locale=True,
ignore_retcode=False,
saltenv='base',
password=None,
**kwargs):
@ -3278,7 +3280,6 @@ def run_bg(cmd,
log_callback=log_callback,
timeout=timeout,
reset_system_locale=reset_system_locale,
ignore_retcode=ignore_retcode,
saltenv=saltenv,
password=password,
**kwargs