aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirements
diff options
context:
space:
mode:
authorMike McQuaid2014-01-20 23:30:25 -0800
committerMike McQuaid2014-01-20 23:30:32 -0800
commitfc518378ab55c3ccc9084bfbbc1c6653e7528fb4 (patch)
tree831506dd505b5e44e13f1303d45aed887f015cf5 /Library/Homebrew/requirements
parent6c99f9247f45186b4665ebf1c32cd708bb42895d (diff)
downloadhomebrew-fc518378ab55c3ccc9084bfbbc1c6653e7528fb4.tar.bz2
python_dependency: cleanup, fix satisfy.
Closes #26067.
Diffstat (limited to 'Library/Homebrew/requirements')
-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