saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #36706 from siccrusher/fix_env_var_validation

Browse source 
Add basic sanity checks for env_vars in pip.install function
This commit is contained in:
Mike Place 2016-11-11 15:47:16 +13:00 • committed by GitHub
commit ee74f3116e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/pip.py
View file

@ -87,7 +87,7 @@ import salt.utils
import tempfile
import salt.utils.locales
import salt.utils.url
from salt.ext.six import string_types
from salt.ext.six import string_types, iteritems
from salt.exceptions import CommandExecutionError, CommandNotFoundError
@ -827,6 +827,9 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
if env_vars:
if isinstance(env_vars, dict):
for k, v in iteritems(env_vars):
if not isinstance(v, string_types):
env_vars[k] = str(v)
os.environ.update(env_vars)
else:
raise CommandExecutionError(