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

Let's have the packages to install as the last arguments to the pip install call.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-07-14 14:26:55 +01:00
parent 0536454f1f
commit ecad0d11c4
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
salt/modules/pip.py
View File

@ -235,34 +235,6 @@ def install(pkgs=None,
if not salt.utils.is_windows():
cmd = ['.', _get_env_activate(bin_env), '&&'] + cmd
if pkgs:
if isinstance(pkgs, basestring):
pkgs = [p.strip() for p in pkgs.split(',')]
# It's possible we replaced version-range commas with semicolons so
# they would survive the previous line (in the pip.installed state).
# Put the commas back in
cmd.extend(
[p.replace(';', ',') for p in pkgs]
)
if editable:
egg_match = re.compile(r'(?:#|#.*?&)egg=([^&]*)')
if isinstance(editable, basestring):
editable = [e.strip() for e in editable.split(',')]
for entry in editable:
# Is the editable local?
if not entry.startswith(('file://', '/')):
match = egg_match.search(entry)
if not match or not match.group(1):
# Missing #egg=theEggName
raise CommandExecutionError(
'You must specify an egg for this editable'
)
cmd.append('--editable={0}'.format(entry))
treq = None
if requirements:
if requirements.startswith('salt://'):
@ -403,6 +375,34 @@ def install(pkgs=None,
for opt in install_options:
cmd.append('--install-option={0}'.format(opt))
if pkgs:
if isinstance(pkgs, basestring):
pkgs = [p.strip() for p in pkgs.split(',')]
# It's possible we replaced version-range commas with semicolons so
# they would survive the previous line (in the pip.installed state).
# Put the commas back in
cmd.extend(
[p.replace(';', ',') for p in pkgs]
)
if editable:
egg_match = re.compile(r'(?:#|#.*?&)egg=([^&]*)')
if isinstance(editable, basestring):
editable = [e.strip() for e in editable.split(',')]
for entry in editable:
# Is the editable local?
if not entry.startswith(('file://', '/')):
match = egg_match.search(entry)
if not match or not match.group(1):
# Missing #egg=theEggName
raise CommandExecutionError(
'You must specify an egg for this editable'
)
cmd.append('--editable={0}'.format(entry))
try:
cmd_kwargs = dict(runas=runas, cwd=cwd)
if bin_env and os.path.isdir(bin_env):