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

Update mine.send to parse args and kwargs more salty

Browse Source
This commit is contained in:
Thomas S Hatch 2013-05-26 08:19:22 -06:00
parent c9f108b787
commit f1640d263c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/mine.py
View File

@ -92,16 +92,22 @@ def send(func, *args, **kwargs):
if not func in __salt__:
return False
data = {}
arg_data = salt.utils.arg_lookup(__salt__[func])
func_data = {}
for ind in range(len(arg_data.get('args', []))):
try:
func_data[arg_data[ind]] = args[ind]
except IndexError:
# Safe error, arg may be in kwargs
pass
func_data.update(kwargs)
f_call = salt.utils.format_call(__salt__[func], func_data)
try:
if args and kwargs:
data[func] = __salt__[func](*args, **kwargs)
elif args:
data[func] = __salt__[func](*args)
elif kwargs:
data[func] = __salt__[func](**kwargs)
if 'kwargs' in f_call:
data[func] = __salt__[func](*f_call['args'], **f_call['kwargs'])
else:
data[func] = __salt__[func]()
except Exception:
data[func] = __salt__[func](*f_call['args'])
except Exception as exc:
log.error(
'Function {0} in mine.send failed to execute'.format(
func