diff options
| author | Tomasz Pajor | 2014-08-09 20:42:22 +0200 |
|---|---|---|
| committer | Mike McQuaid | 2014-08-10 15:26:13 +0100 |
| commit | 435092ae0521e79d8ea21c8d4708031e3b4b17a3 (patch) | |
| tree | 4fcbfa1d9499b0adab8253631561ae4a8a272f9f /Library/Homebrew | |
| parent | f7dbf715002a45b7fd3baf493f8f68a1d486bbb1 (diff) | |
| download | homebrew-435092ae0521e79d8ea21c8d4708031e3b4b17a3.tar.bz2 | |
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 #31476.
Closes #31444.
Closes #30901.
Closes #31471.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 45c70e6ce..5cd7be576 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 |