aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/python_helper.rb
diff options
context:
space:
mode:
authorSamuel John2013-07-15 21:28:37 +0200
committerSamuel John2013-07-15 21:28:37 +0200
commit7782804ee5863efea3ad00cb37e40c831e67d6c3 (patch)
tree9aaba175a63a1f09341d476408ba9d92284f8935 /Library/Homebrew/python_helper.rb
parent650cb8e69ba4c5322c5aeabc5068b92c6d923b8d (diff)
downloadhomebrew-7782804ee5863efea3ad00cb37e40c831e67d6c3.tar.bz2
Fix multiple execution of python do ... end blocks
Only run the `python do ... end` loop once even if multiple `depends_on :python => 'module-name'` are present.
Diffstat (limited to 'Library/Homebrew/python_helper.rb')
-rw-r--r--Library/Homebrew/python_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/python_helper.rb b/Library/Homebrew/python_helper.rb
index 13ff28348..b121ca5d7 100644
--- a/Library/Homebrew/python_helper.rb
+++ b/Library/Homebrew/python_helper.rb
@@ -39,7 +39,8 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
if !filtered_python_reqs.map{ |fpr| fpr.binary }.include?(py.binary) &&
py.satisfied? &&
options[:allowed_major_versions].include?(py.version.major) &&
- self.build.with?(py.name) || !(py.optional? || py.recommended?)
+ # if optional or recommended then check the build.with?
+ (self.build.with?(py.name) || !(py.optional? || py.recommended?))
then
filtered_python_reqs << py
end