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

Onlyif return codes added to debug log

Browse Source
This commit is contained in:
rallytime 2014-04-10 10:02:16 -06:00
parent c2dda33033
commit 7d02175990
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/states/cmd.py
View File

@ -279,22 +279,20 @@ def _run_check(cmd_kwargs, onlyif, unless, group, creates):
if onlyif is not None:
if isinstance(onlyif, string_types):
if __salt__['cmd.retcode'](onlyif, ignore_retcode=True, **cmd_kwargs) != 0:
cmd = __salt__['cmd.retcode'](onlyif, ignore_retcode=True, **cmd_kwargs)
if cmd != 0:
log.debug('onlyif return code: {0}'.format(cmd))
return {'comment': 'onlyif execution failed',
'result': True}
elif isinstance(onlyif, list):
if all([
__salt__['cmd.retcode'](
entry,
ignore_retcode=True,
**cmd_kwargs
) != 0 for entry in onlyif
]):
cmd = __salt__['cmd.retcode'](entry, ignore_retcode=True, **cmd_kwargs)
if all([cmd != 0 for entry in onlyif]):
log.debug('onlyif return code: {0}'.format(cmd))
return {'comment': 'onlyif execution failed',
'result': True}
elif not isinstance(onlyif, string_types):
if not onlyif:
log.debug('Command not run: onlyif did not evaluate to string_type')
return {'comment': 'onlyif execution failed',
'result': True}