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

Merge pull request #2578 from giantlock/develop

Browse Source 
stateful is optional argument
This commit is contained in:
Thomas S Hatch 2012-11-16 07:53:43 -08:00
commit 52cbcb1a12
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
salt/states/cmd.py
View File

@ -370,13 +370,13 @@ def run(name,
_delegate_to_state(
'cmd.run',
name,
onlyif,
unless,
cwd,
user,
group,
shell,
env,
onlyif=onlyif,
unless=unless,
cwd=cwd,
user=user,
group=group,
shell=shell,
env=env,
**kwargs
)
)
@ -483,13 +483,13 @@ def script(name,
_delegate_to_state(
'cmd.script',
name,
onlyif,
unless,
cwd,
user,
group,
shell,
env,
onlyif=onlyif,
unless=unless,
cwd=cwd,
user=user,
group=group,
shell=shell,
env=env,
**kwargs
)
)
@ -562,21 +562,23 @@ def mod_watch(name, **kwargs):
Execute a cmd function based on a watch call
'''
if kwargs['sfun'] == 'wait' or kwargs['sfun'] == 'run':
if kwargs['stateful']:
if kwargs.get('stateful'):
kwargs.pop('stateful')
return _reinterpreted_state(
_delegate_to_state(
'cmd.run',
name,
**kwargs
)
)
return run(name, **kwargs)
elif kwargs['sfun'] == 'wait_script' or kwargs['sfun'] == 'script':
if kwargs['stateful']:
if kwargs.get('stateful'):
kwargs.pop('stateful')
return _reinterpreted_state(
_delegate_to_state(
'cmd.script',
name
**kwargs
)
)