admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

formula_installer: fix reqs default formulae.

Browse Source 
(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 <mike@mikemcquaid.com>
This commit is contained in:
Tomasz Pajor 2014-08-09 20:42:22 +02:00 committed by Mike McQuaid
parent 47fedf2951
commit 03cf38c451
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -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