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

Merge pull request #33538 from alprs/fix-cmd_user_runas_deprecation_bug

Browse Source 
Fix a KeyError if group is provided but not user in cmd states
This commit is contained in:
Mike Place 2016-05-26 10:58:05 -07:00
commit 4831c6a353
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/cmd.py
View File

@ -491,7 +491,7 @@ def wait(name,
'Replace them with runas. '
'These arguments will be removed in Salt Oxygen.'
)
if kwargs['user'] is not None and runas is None:
if 'user' in kwargs and kwargs['user'] is not None and runas is None:
runas = kwargs.pop('user')
# Ignoring our arguments is intentional.
@ -622,7 +622,7 @@ def wait_script(name,
'Replace them with runas. '
'These arguments will be removed in Salt Oxygen.'
)
if kwargs['user'] is not None and runas is None:
if 'user' in kwargs and kwargs['user'] is not None and runas is None:
runas = kwargs.pop('user')
# Ignoring our arguments is intentional.
@ -805,7 +805,7 @@ def run(name,
'Replace them with runas. '
'These arguments will be removed in Salt Oxygen.'
)
if kwargs['user'] is not None and runas is None:
if 'user' in kwargs and kwargs['user'] is not None and runas is None:
runas = kwargs.pop('user')
cmd_kwargs = {'cwd': cwd,
@ -1041,7 +1041,7 @@ def script(name,
'Replace them with runas. '
'These arguments will be removed in Salt Oxygen.'
)
if kwargs['user'] is not None and runas is None:
if 'user' in kwargs and kwargs['user'] is not None and runas is None:
runas = kwargs.pop('user')
cmd_kwargs = copy.deepcopy(kwargs)