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

Move Solaris USER workaround up a bit

Browse Source 
In its previous position, the run_env would not get the workaround when
clean_env was set to True.
This commit is contained in:
Erik Johnson 2018-02-13 13:42:20 -06:00
parent 13cdb52690
commit 8ee0a3a28b
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/cmdmod.py
View File

@ -423,6 +423,10 @@ def _run(cmd,
env_encoded = env_encoded.encode(__salt_system_encoding__)
env_runas = dict(list(zip(*[iter(env_encoded.split(b'\0'))]*2)))
env_runas.update(env)
# Fix platforms like Solaris that don't set a USER env var in the
# user's default environment as obtained above.
if env_runas.get('USER') != runas:
env_runas['USER'] = runas
env = env_runas
# Encode unicode kwargs to filesystem encoding to avoid a
# UnicodeEncodeError when the subprocess is invoked.
@ -465,10 +469,6 @@ def _run(cmd,
else:
run_env = os.environ.copy()
run_env.update(env)
# Fix platforms like Solaris that don't set a USER env var in the
# user's default environment as obtained above.
if runas is not None and run_env.get('USER') != runas:
run_env['USER'] = runas
if python_shell is None:
python_shell = False