From f90e303fb9ab79ba2dcda03984cc72f021f998fe Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 29 Oct 2014 00:36:13 -0500 Subject: [PATCH] Test default formula requirements against correct dependent --- Library/Homebrew/formula_installer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 179f05ea3a..16bec5fab9 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)