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 #4435 from giantlock/develop

Browse Source 
fix backtrace when environment empty
This commit is contained in:
Thomas S Hatch 2013-04-08 14:02:33 -07:00
commit 3a2c126e4f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/cmdmod.py
View File

@ -225,24 +225,23 @@ def _run(cmd,
try:
# Getting the environment for the runas user
# There must be a better way to do this.
py_code = 'import os, json;' \
'print(json.dumps(os.environ.__dict__ or {}))'
if __grains__['os'] in ['MacOS', 'Darwin']:
env_cmd = ('sudo -i -u {1} -- "{2} -c \'import os, json;'
'print(json.dumps(os.environ.__dict__))\'"').format(
shell, runas, sys.executable)
env_cmd = ('sudo -i -u {1} -- "{2}"'
).format(shell, runas, sys.executable)
elif __grains__['os'] in ['FreeBSD']:
env_cmd = ('su - {1} -c "{0} -c \'{2} -c \'\\\'\''
'import os, json;'
'print(json.dumps(os.environ.__dict__))\'\\\'\'\'"'
env_cmd = ('su - {1} -c "{0} -c \'{2}\'"'
).format(shell, runas, sys.executable)
else:
env_cmd = ('su -s {0} - {1} -c "{2} -c \'import os, json;'
'print(json.dumps(os.environ.__dict__))\'"').format(
shell, runas, sys.executable)
env_cmd = ('su -s {0} - {1} -c "{2}"'
).format(shell, runas, sys.executable)
env_json = subprocess.Popen(
env_cmd,
shell=True,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE
).communicate()[0]
).communicate(py_code)[0]
env_json = filter(lambda x: x.startswith('{"') and x.endswith('}'),
env_json.splitlines()).pop()
env_runas = json.loads(env_json).get('data', {})