mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Further tweak how to find pip in virtualenv on centos/redhat/fedora
In a virtualenv, pip is called just pip. This fixes the pip module to search for the virtualenv pip first before trying the pip-python and python-pip variants. Without this, pip module would not install to the virtualenv when that parameter is provided.
This commit is contained in:
parent
1e7526ee78
commit
5b7c8fcc38
1 changed files with 13 additions and 3 deletions
16
library/pip
16
library/pip
|
@ -153,10 +153,20 @@ def main():
|
|||
out += out_venv
|
||||
err += err_venv
|
||||
|
||||
pip = module.get_bin_path('python-pip', False, ['%s/bin' % env])
|
||||
if not pip:
|
||||
pip = module.get_bin_path('pip-python', False, ['%s/bin' % env])
|
||||
# On Debian and Ubuntu, pip is pip.
|
||||
# On Fedora18 and up, pip is python-pip.
|
||||
# On Fedora17 and below, CentOS and RedHat 6 and 5, pip is pip-python.
|
||||
# On Fedora, CentOS, and RedHat, the exception is in the virtualenv.
|
||||
# There, pip is just pip.
|
||||
# Try pip with the virtualenv directory first.
|
||||
pip = module.get_bin_path('pip', False, ['%s/bin' % env])
|
||||
|
||||
for p in ['python-pip', 'pip-python']:
|
||||
if not pip:
|
||||
pip = module.get_bin_path(p, False, ['%s/bin' % env])
|
||||
|
||||
# pip should have been found by now. The final call to get_bin_path
|
||||
# will trigger fail_json.
|
||||
if not pip:
|
||||
pip = module.get_bin_path('pip', True, ['%s/bin' % env])
|
||||
|
||||
|
|
Loading…
Reference in a new issue