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

Parse kwargs with YAML, Fix #5224

Browse Source
This commit is contained in:
Colton Myers 2013-05-24 16:24:45 -06:00
parent 0db1eb70ca
commit d00a89afd4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/minion.py
View File

@ -134,10 +134,10 @@ def detect_kwargs(func, args, data=None):
# Invalid kwarg
pass
elif has_kwargs:
kwargs[comps[0]] = '='.join(comps[1:])
kwargs[comps[0]] = yamlify_arg('='.join(comps[1:]))
continue
elif comps[0] in kwarg_spec:
kwargs[comps[0]] = '='.join(comps[1:])
kwargs[comps[0]] = yamlify_arg('='.join(comps[1:]))
continue
_args.append(arg)
if has_kwargs and isinstance(data, dict):
@ -147,6 +147,18 @@ def detect_kwargs(func, args, data=None):
return _args, kwargs
def yamlify_arg(arg):
'''
yaml.safe_load the arg unless it has a newline in it
'''
try:
if '\n' not in arg:
return yaml.safe_load(arg)
except Exception:
pass
return arg
class SMinion(object):
'''
Create an object that has loaded all of the minion module functions,