Merge pull request #24475 from rallytime/bp-24454

Back-port #24454 to 2015.5
This commit is contained in:
Justin Findlay 2015-06-06 19:29:32 -06:00
commit 8618d5b6ea

View file

@ -270,8 +270,8 @@ def _run(cmd,
# Getting the environment for the runas user
# There must be a better way to do this.
py_code = (
'import os, itertools; '
'print \"\\0\".join(itertools.chain(*os.environ.items()))'
'import sys, os, itertools; '
'sys.stdout.write(\"\\0\".join(itertools.chain(*os.environ.items())))'
)
if __grains__['os'] in ['MacOS', 'Darwin']:
env_cmd = ('sudo', '-i', '-u', runas, '--',