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 #3154 from torhve/develop

Browse Source 
Pass on the given env
This commit is contained in:
Thomas S Hatch 2013-01-04 21:40:31 -08:00
commit cc1591e3a4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/cmdmod.py
View File

@ -291,7 +291,7 @@ def run_stdout(cmd, cwd=None, runas=None, shell=DEFAULT_SHELL, env=(),
salt '*' cmd.run_stdout template=jinja "ls -l /tmp/{{grains.id}} | awk '/foo/{print $2}'" 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=(), stdout = _run(cmd, runas=runas, cwd=cwd, shell=shell, env=env,
template=template, rstrip=rstrip)["stdout"] template=template, rstrip=rstrip)["stdout"]
log.debug('stdout: {0}'.format(stdout)) log.debug('stdout: {0}'.format(stdout))
return stdout return stdout