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

Keep first level away from lists.

Browse source
This commit is contained in:
Bo Maryniuk 2016-03-08 16:22:45 +01:00
parent baaed005b8
commit f96c8f9b5e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/__init__.py
View file

@ -1740,7 +1740,7 @@ def gen_state_tag(low):
return '{0[state]}_|-{0[__id__]}_|-{0[name]}_|-{0[fun]}'.format(low)
def check_state_result(running):
def check_state_result(running, recurse=False):
'''
Check the total return value of the run and determine if the running
dict has any issues
@ -1753,13 +1753,15 @@ def check_state_result(running):
ret = True
for state_result in six.itervalues(running):
if not recurse and not isinstance(state_result, dict):
ret = False
if ret and isinstance(state_result, dict):
result = state_result.get('result', _empty)
if result is False:
ret = False
# only override return value if we are not already failed
elif result is _empty and isinstance(state_result, dict) and ret:
ret = check_state_result(state_result)
ret = check_state_result(state_result, recurse=True)
# return as soon as we got a failure
if not ret:
break