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

Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8

Browse source
This commit is contained in:
Colton Myers 2015-11-23 10:08:57 -07:00
commit 1432cc806d
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

@ -240,7 +240,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:
@ -248,7 +248,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: