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

Bailout if a state function returns anything but dictionary type

Browse Source
This commit is contained in:
Bo Maryniuk 2018-01-16 18:02:33 +01:00
parent 9df156ed7c
commit 0baddd675a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/state.py
View File

@ -1905,6 +1905,9 @@ class State(object):
self.state_con.pop('runas', None)
self.state_con.pop('runas_password', None)
if not isinstance(ret, dict):
return ret
# If format_call got any warnings, let's show them to the user
if 'warnings' in cdata:
ret.setdefault('warnings', []).extend(cdata['warnings'])