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

Fix failing tests

Browse Source
This commit is contained in:
Mike Place 2014-07-01 10:23:30 -06:00
parent 8958da778a
commit 6844e5a119
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/state.py
View File

@ -124,7 +124,7 @@ def _prior_running_states(jid):
return ret
def _check_queue(queue=False, **kwargs):
def _check_queue(queue, kwargs):
'''
Utility function to queue the state run if requested
and to check for conflicts in currently running states
@ -132,8 +132,10 @@ def _check_queue(queue=False, **kwargs):
if queue:
_wait(kwargs.get('__pub_jid'))
else:
__context__['retcode'] = 1
return running()
conflict = running()
if conflict:
__context__['retcode'] = 1
return conflict
def low(data, queue=False, **kwargs):