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 pull request #29500 from rallytime/bp-29467

Browse source 
Back-port #29467 to 2015.8
This commit is contained in:
Mike Place 2015-12-07 16:23:59 -07:00
commit 148dad6674
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/states/module.py
View file

@ -265,8 +265,11 @@ def run(name, **kwargs):
ret['result'] = mret
else:
changes_ret = ret['changes'].get('ret', {})
if isinstance(changes_ret, dict) and changes_ret.get('retcode', 0) != 0:
ret['result'] = False
if isinstance(changes_ret, dict):
if isinstance(changes_ret.get('result', {}), bool):
ret['result'] = changes_ret.get('result', {})
elif changes_ret.get('retcode', 0) != 0:
ret['result'] = False
return ret
mod_watch = salt.utils.alias_function(run, 'mod_watch')