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

formula_installer: don't assume requirement dependency is default formula.

Browse Source
This commit is contained in:
Mike McQuaid 2017-01-09 22:44:47 +00:00
parent 0158cc2e23
commit 5821572b9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -370,8 +370,8 @@ class FormulaInstaller
raise UnsatisfiedRequirements, fatals raise UnsatisfiedRequirements, fatals
end end
def install_requirement_default_formula?(req, dependent, build) def install_requirement_formula?(req, dependent, build)
return false unless req.default_formula? return false unless req.to_dependency
return true unless req.satisfied? return true unless req.satisfied?
return false if req.run? return false if req.run?
install_bottle_for?(dependent, build) || build_bottle? install_bottle_for?(dependent, build) || build_bottle?
@ -390,7 +390,7 @@ class FormulaInstaller
Requirement.prune Requirement.prune
elsif req.build? && install_bottle_for?(dependent, build) elsif req.build? && install_bottle_for?(dependent, build)
Requirement.prune Requirement.prune
elsif install_requirement_default_formula?(req, dependent, build) elsif install_requirement_formula?(req, dependent, build)
dep = req.to_dependency dep = req.to_dependency
deps.unshift(dep) deps.unshift(dep)
formulae.unshift(dep.to_formula) formulae.unshift(dep.to_formula)