From ee4fe9ff55278a03aebd5d31fa448a59a10fd940 Mon Sep 17 00:00:00 2001 From: Ton Kersten Date: Sat, 24 Nov 2012 13:36:32 +0100 Subject: [PATCH 1/2] Added pip-python to the search for CentOS 6 compatibility --- library/pip | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/pip b/library/pip index 7ca62ca107c..fe5823f1e57 100644 --- a/library/pip +++ b/library/pip @@ -136,6 +136,9 @@ def main(): err += err_venv pip = module.get_bin_path('python-pip', False, ['%s/bin' % env]) + if not pip: + pip = module.get_bin_path('pip-python', True, ['%s/bin' % env]) + if not pip: pip = module.get_bin_path('pip', True, ['%s/bin' % env]) From 7bba04b1766ee3074be49249c027312b3e5e141c Mon Sep 17 00:00:00 2001 From: Ton Kersten Date: Sat, 24 Nov 2012 16:26:15 +0100 Subject: [PATCH 2/2] Corrected for fallthrough --- library/pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/pip b/library/pip index fe5823f1e57..1912967557a 100644 --- a/library/pip +++ b/library/pip @@ -137,7 +137,7 @@ def main(): pip = module.get_bin_path('python-pip', False, ['%s/bin' % env]) if not pip: - pip = module.get_bin_path('pip-python', True, ['%s/bin' % env]) + pip = module.get_bin_path('pip-python', False, ['%s/bin' % env]) if not pip: pip = module.get_bin_path('pip', True, ['%s/bin' % env])