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

Add type-checking for defaults and context in cmd.script

Browse Source
This commit is contained in:
Loren Gordon 2015-10-21 06:02:41 -04:00
parent e3a5758679
commit 0354128484
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/states/cmd.py
View File

@ -1017,13 +1017,22 @@ def script(name,
'documentation.')
return ret
if HAS_GRP:
pgid = os.getegid()
if context and not isinstance(context, dict):
ret['comment'] = ('Invalidly-formatted \'context\' parameter. Must '
'be formed as a dict.')
return ret
if defaults and not isinstance(defaults, dict):
ret['comment'] = ('Invalidly-formatted \'defaults\' parameter. Must '
'be formed as a dict.')
return ret
tmpctx = defaults if defaults else {}
if context:
tmpctx.update(context)
if HAS_GRP:
pgid = os.getegid()
cmd_kwargs = copy.deepcopy(kwargs)
cmd_kwargs.update({'runas': user,
'shell': shell or __grains__['shell'],