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

Fix pip command to not quote spaces in cmd line args

Browse source
This commit is contained in:
Michael Barrientos 2015-11-10 16:34:18 -08:00
parent decc31a766
commit 6df6cb82a6
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/pip.py
View file

@ -646,7 +646,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
cmd.append('--pre')
if cert:
cmd.append(['--cert', cert])
cmd.extend(['--cert', cert])
if global_options:
if isinstance(global_options, string_types):
@ -697,7 +697,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
allow_external = [p.strip() for p in allow_external.split(',')]
for pkg in allow_external:
cmd.append('--allow-external {0}'.format(pkg))
cmd.extend(['--allow-external', pkg])
if allow_unverified:
if isinstance(allow_unverified, string_types):
@ -705,7 +705,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
[p.strip() for p in allow_unverified.split(',')]
for pkg in allow_unverified:
cmd.append('--allow-unverified {0}'.format(pkg))
cmd.extend(['--allow-unverified', pkg])
if process_dependency_links:
cmd.append('--process-dependency-links')
@ -717,7 +717,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
raise CommandExecutionError('env_vars {0} is not a dictionary'.format(env_vars))
if trusted_host:
cmd.append('--trusted-host {0}'.format(trusted_host))
cmd.extend(['--trusted-host', trusted_host])
try:
cmd_kwargs = dict(cwd=cwd, saltenv=saltenv, use_vt=use_vt, runas=user)