cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolves issues with newer versions of pip not having a --use-mirrors paramater for the install command

Browse source
This commit is contained in:
James Tanner 2014-01-03 15:29:18 -05:00
parent 6f16ea6d49
commit f723311601
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packaging/pip
View file

@ -275,6 +275,7 @@ def main():
pip = _get_pip(module, env, module.params['executable'])
cmd = '%s %s' % (pip, state_map[state])
cmd_opts = None
# If there's a virtualenv we want things we install to be able to use other
# installations that exist as binaries within this virtualenv. Example: we
@ -319,7 +320,11 @@ def main():
is_local_path = True
# for tarball or vcs source, applying --use-mirrors doesn't really make sense
is_package = is_vcs or is_tar or is_local_path # just a shortcut for bool
if not is_package and state != 'absent' and use_mirrors:
if cmd_opts is None:
cmd_opts = _get_cmd_options(module, cmd)
if not is_package and state != 'absent' and use_mirrors and '--use-mirrors' in cmd_opts:
cmd += ' --use-mirrors'
cmd += ' %s' % _get_full_name(name, version)
elif requirements: