Merge pull request poise#23 from tdcarrol/master

Joshua Timberman · Joshua Timberman · commit e26ac41fe5a1 · 2012-12-10T11:29:01.000-08:00
[COOK-1866] /usr/bin/ is not pip_binary location when doing a source install on rhel.
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-if platform_family?("rhel")
+if platform_family?("rhel") and node['python']['install_method'] == 'package'
   pip_binary = "/usr/bin/pip"
 elsif platform_family?("smartos")
   pip_binary = "/opt/local/bin/pip"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# limitations under the License.`
`19`	`19`	`#`
`20`	`20`
`21`		`-if platform_family?("rhel")`
	`21`	`+if platform_family?("rhel") and node['python']['install_method'] == 'package'`
`22`	`22`	`pip_binary = "/usr/bin/pip"`
`23`	`23`	`elsif platform_family?("smartos")`
`24`	`24`	`pip_binary = "/opt/local/bin/pip"`