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 #29128 from cachedout/tweak_29122

Browse Source 
Set a safer default value for ret in saltmod
This commit is contained in:
Colton Myers 2015-11-23 10:07:40 -07:00
commit 219367a23d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/states/saltmod.py
View File

@ -248,7 +248,7 @@ def state(
if 'return' in mdata and 'ret' not in mdata:
mdata['ret'] = mdata.pop('return')
m_state = None
m_state = True
if mdata.get('failed', False):
m_state = False
else:
@ -256,7 +256,7 @@ def state(
m_ret = mdata['ret']
except KeyError:
m_state = False
if m_state is None:
if not m_state:
m_state = salt.utils.check_state_result(m_ret)
if not m_state: