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

Test for python-pip as well as pip

Browse source 
On Red Hat, CentOS and Fedora systems, the pip binary will be called python-pip
instead of pip. This commit makes the pip module also check for python-pip.

The reason we check for python-pip *first*, is to have ansible fail on not
finding 'pip' and reporting *that*. This is consistent with current behaviour
and will not confuse users of Debian et al., where the 'python-pip' binary
never exists.

Tested on Fedora 18 and Ubuntu 12.04.
This commit is contained in:
Maxim Burgerhout 2012-10-14 12:14:59 +02:00
parent 05ae500d78
commit 2f6b9e69a7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/pip
View file

@ -135,7 +135,9 @@ def main():
out += out_venv
err += err_venv
pip = module.get_bin_path('pip', True, ['%s/bin' % env])
pip = module.get_bin_path('python-pip', False, ['%s/bin' % env])
if not pip:
pip = module.get_bin_path('pip', True, ['%s/bin' % env])
state = module.params['state']
name = module.params['name']