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

Merge pull request #2940 from giantlock/develop

Browse Source 
cron.file state fix
This commit is contained in:
Thomas S Hatch 2012-12-18 15:35:56 -08:00
commit dad6d6ac75
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/modules/cmdmod.py
View File

@ -250,7 +250,8 @@ def _run_all_quiet(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), templ
return _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env, quiet=True, template=template)
def run(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=None):
def run(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(),
template=None, rstrip=True):
'''
Execute the passed command and return the output as a string
@ -265,13 +266,15 @@ def run(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=None):
salt '*' cmd.run template=jinja "ls -l /tmp/{{grains.id}} | awk '/foo/{print $2}'"
'''
out = _run(cmd, runas=runas, shell=shell,
cwd=cwd, stderr=subprocess.STDOUT, env=env, template=template)['stdout']
out = _run(cmd, runas=runas, shell=shell, cwd=cwd,
stderr=subprocess.STDOUT, env=env, template=template,
rstrip=rstrip)['stdout']
log.debug('output: {0}'.format(out))
return out
def run_stdout(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=None):
def run_stdout(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(),
template=None, rstrip=True):
'''
Execute a command, and only return the standard out
@ -286,12 +289,14 @@ def run_stdout(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=
salt '*' cmd.run_stdout template=jinja "ls -l /tmp/{{grains.id}} | awk '/foo/{print $2}'"
'''
stdout = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=(), template=template)["stdout"]
stdout = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=(),
template=template, rstrip=rstrip)["stdout"]
log.debug('stdout: {0}'.format(stdout))
return stdout
def run_stderr(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=None):
def run_stderr(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(),
template=None, rstrip=True):
'''
Execute a command and only return the standard error
@ -306,12 +311,14 @@ def run_stderr(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=
salt '*' cmd.run_stderr template=jinja "ls -l /tmp/{{grains.id}} | awk '/foo/{print $2}'"
'''
stderr = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env, template=template)["stderr"]
stderr = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env,
template=template, rstrip=rstrip)["stderr"]
log.debug('stderr: {0}'.format(stderr))
return stderr
def run_all(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=None):
def run_all(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(),
template=None, rstrip=True):
'''
Execute the passed command and return a dict of return data
@ -326,7 +333,8 @@ def run_all(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(), template=Non
salt '*' cmd.run_all template=jinja "ls -l /tmp/{{grains.id}} | awk '/foo/{print $2}'"
'''
ret = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env, template=template)
ret = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env,
template=template, rstrip=rstrip)
if ret['retcode'] != 0:
rcode = ret['retcode']

2
salt/modules/cron.py
View File

@ -88,7 +88,7 @@ def raw_cron(user):
cmd = 'crontab -l {0}'.format(user)
else:
cmd = 'crontab -l -u {0}'.format(user)
return __salt__['cmd.run_stdout'](cmd)
return __salt__['cmd.run_stdout'](cmd, rstrip=False)
def list_tab(user):