From 03cf38c4515485f53d048995e48d82b2518f8b96 Mon Sep 17 00:00:00 2001 From: Tomasz Pajor Date: Sat, 9 Aug 2014 20:42:22 +0200 Subject: [PATCH] formula_installer: fix reqs default formulae. (Commit message written by Mike McQuaid) With the change in a0a93f1b3b7b2be9b8a319be91086ffe220f8e32 unfortunately requirements with default formulae no longer could be resolved when the default formulae were not installed. This commit fixes this problem. Closes Homebrew/homebrew#31476. Closes Homebrew/homebrew#31444. Closes Homebrew/homebrew#30901. Closes Homebrew/homebrew#31471. Signed-off-by: Mike McQuaid --- Library/Homebrew/formula_installer.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 45c70e6ce9..5cd7be576a 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -262,12 +262,14 @@ class FormulaInstaller Requirement.prune elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build) Requirement.prune + elsif req.satisfied? && !(pour_bottle? || build_bottle?) + Requirement.prune elsif install_requirement_default_formula?(req) dep = req.to_dependency deps.unshift(dep) formulae.unshift(dep.to_formula) Requirement.prune - elsif req.satisfied? + elsif deps.include?(req.to_dependency) Requirement.prune else unsatisfied_reqs[dependent] << req