aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2014-01-20 23:30:25 -0800
committerMike McQuaid2014-01-20 23:30:32 -0800
commit689be6620341221df6e82ab98e1b9413a96a7442 (patch)
tree36cd4d51ef73726b542f1af00b921402825cb39d /Library
parenta65f649cf54d90700d039854c1619027cda9e8f6 (diff)
downloadbrew-689be6620341221df6e82ab98e1b9413a96a7442.tar.bz2
python_dependency: cleanup, fix satisfy.
Closes Homebrew/homebrew#26067.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/requirements/python_dependency.rb22
1 files changed, 3 insertions, 19 deletions
diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb
index aee42d9f6..58ca58670 100644
--- a/Library/Homebrew/requirements/python_dependency.rb
+++ b/Library/Homebrew/requirements/python_dependency.rb
@@ -4,7 +4,7 @@ class PythonDependency < Requirement
fatal true
satisfy :build_env => false do
- which python_binary
+ which 'python'
end
def modify_build_environment
@@ -13,30 +13,14 @@ class PythonDependency < Requirement
# Deprecated
def to_s
- python_binary
- end
-
- protected
-
- def python_binary
'python'
end
-
- def system_python?
- which(python_binary).to_s == "/usr/bin/python"
- end
end
class Python3Dependency < PythonDependency
default_formula 'python3'
- protected
-
- def python_binary
- 'python3'
- end
-
- def system_python?
- false
+ satisfy :build_env => false do
+ which 'python3'
end
end