From 6b1ce9827e857ae5c4b1dc8436d174a7bb4019a0 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Sun, 9 Aug 2015 19:12:54 -0700 Subject: [PATCH] PythonRequirement: don't blindly use first Python in PATH Fixes Homebrew/homebrew#42461. --- .../Homebrew/requirements/python_requirement.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/requirements/python_requirement.rb b/Library/Homebrew/requirements/python_requirement.rb index 1fb1045f0f..adf13488cf 100644 --- a/Library/Homebrew/requirements/python_requirement.rb +++ b/Library/Homebrew/requirements/python_requirement.rb @@ -19,13 +19,17 @@ class PythonRequirement < Requirement end env do - if system_python? - if python_binary == "python" - version = python_short_version - ENV["PYTHONPATH"] = "#{HOMEBREW_PREFIX}/lib/python#{version}/site-packages" - end - elsif which_python + short_version = python_short_version + + if !system_python? && short_version == Version.new("2.7") ENV.prepend_path "PATH", which_python.dirname + # Homebrew Python should take precedence over older Pythons in the PATH + elsif short_version != Version.new("2.7") + ENV.prepend_path "PATH", Formula["python"].opt_bin + end + + if python_binary == "python" + ENV["PYTHONPATH"] = "#{HOMEBREW_PREFIX}/lib/python#{version}/site-packages" end end