aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-10-29 00:36:13 -0500
committerJack Nagel2014-10-29 00:37:51 -0500
commitf90e303fb9ab79ba2dcda03984cc72f021f998fe (patch)
tree604ca839a3669f224bfc868fa0577d3999d867cd
parent27f2aa5f2c0a9ee5679fcbd5cd6f0d31a6b0bd29 (diff)
downloadbrew-f90e303fb9ab79ba2dcda03984cc72f021f998fe.tar.bz2
Test default formula requirements against correct dependent
-rw-r--r--Library/Homebrew/formula_installer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 179f05ea3..16bec5fab 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -235,11 +235,11 @@ class FormulaInstaller
raise UnsatisfiedRequirements.new(fatals) unless fatals.empty?
end
- def install_requirement_default_formula?(req, build)
+ def install_requirement_default_formula?(req, dependent, build)
return false unless req.default_formula?
return false if build.without?(req) && (req.recommended? || req.optional?)
return true unless req.satisfied?
- pour_bottle? || build_bottle?
+ install_bottle_for?(dependent, build) || build_bottle?
end
def expand_requirements
@@ -256,7 +256,7 @@ class FormulaInstaller
Requirement.prune
elsif req.build? && install_bottle_for?(dependent, build)
Requirement.prune
- elsif install_requirement_default_formula?(req, build)
+ elsif install_requirement_default_formula?(req, dependent, build)
dep = req.to_dependency
deps.unshift(dep)
formulae.unshift(dep.to_formula)