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

Merge pull request #28012 from rallytime/fix-28010

Browse Source 
Clean up stack trace when something goes wrong with minion output
This commit is contained in:
Mike Place 2015-10-16 06:40:59 -06:00
commit d41018fa8e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/saltmod.py
View File

@ -251,8 +251,12 @@ def state(
if mdata.get('failed', False):
m_state = False
else:
m_ret = mdata['ret']
m_state = salt.utils.check_state_result(m_ret)
try:
m_ret = mdata['ret']
except KeyError:
m_state = False
if not m_state:
m_state = salt.utils.check_state_result(m_ret)
if not m_state:
if minion not in fail_minions: