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

Explore 'module.run' response to catch the 'result' in depth

Browse source
This commit is contained in:
Pablo Suárez Hernández 2018-03-07 09:42:46 +00:00
parent ca28cfd4e4
commit 726ca3044d
No known key found for this signature in database
GPG key ID: A9683F02B512C911
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/states/module.py
View file

@ -530,7 +530,20 @@ def _get_result(func_ret, changes):
res = changes_ret.get('result', {})
elif changes_ret.get('retcode', 0) != 0:
res = False
# Explore dict in depth to determine if there is a
# 'result' key set to False which sets the global
# state result.
else:
res = _get_result_in_depth(changes_ret)
return res
def _get_result_in_depth(node):
for key, val in node.iteritems():
if key == 'result' and val is False:
return False
elif isinstance(val, dict):
return _get_result_in_depth(val)
return True
mod_watch = salt.utils.alias_function(run, 'mod_watch')