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

Revert "formula_installer: fix reqs default formulae."

Browse Source 
This reverts commit 435092ae0521e79d8ea21c8d4708031e3b4b17a3.
This commit is contained in:
Mike McQuaid 2014-08-10 16:41:30 +01:00
parent 03cf38c451
commit 064aff2591
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -262,14 +262,12 @@ class FormulaInstaller
Requirement.prune Requirement.prune
elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build) elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build)
Requirement.prune Requirement.prune
elsif req.satisfied? && !(pour_bottle? || build_bottle?)
Requirement.prune
elsif install_requirement_default_formula?(req) elsif install_requirement_default_formula?(req)
dep = req.to_dependency dep = req.to_dependency
deps.unshift(dep) deps.unshift(dep)
formulae.unshift(dep.to_formula) formulae.unshift(dep.to_formula)
Requirement.prune Requirement.prune
elsif deps.include?(req.to_dependency) elsif req.satisfied?
Requirement.prune Requirement.prune
else else
unsatisfied_reqs[dependent] << req unsatisfied_reqs[dependent] << req