aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2014-08-11 15:32:19 +0100
committerMike McQuaid2014-08-11 15:33:35 +0100
commitbf88ddf5db7fa027c646eee13796635798aee076 (patch)
treec2f177d1949bcf12ab737a17fe598bd9d823069d
parentb452a5c035b222c4413d762668ee94a1fcdd6627 (diff)
downloadhomebrew-bf88ddf5db7fa027c646eee13796635798aee076.tar.bz2
formula_installer: default_formula using build.
Use the build options instead of whether the requirement is optional to work out if it is needed. This handles the case of an optional requirement becoming needed because it's a dependency for another formula. Closes #31476.
-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 9e26a78be..2b064107b 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -239,9 +239,9 @@ class FormulaInstaller
raise UnsatisfiedRequirements.new(f, fatals) unless fatals.empty?
end
- def install_requirement_default_formula?(req)
+ def install_requirement_default_formula?(req, build)
return false unless req.default_formula?
- return false if req.optional?
+ return false if build.without?(req)
return true unless req.satisfied?
pour_bottle? || build_bottle?
end
@@ -262,7 +262,7 @@ class FormulaInstaller
Requirement.prune
elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build)
Requirement.prune
- elsif install_requirement_default_formula?(req)
+ elsif install_requirement_default_formula?(req, build)
dep = req.to_dependency
deps.unshift(dep)
formulae.unshift(dep.to_formula)