diff options
| author | Mike McQuaid | 2017-01-09 22:44:47 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-01-11 12:01:08 -0800 |
| commit | 5821572b9b14b682feaec3f0c42afdba61a821b2 (patch) | |
| tree | 6aa49a99a2a89f41beb3e951c16b183f1ae90c84 /Library | |
| parent | 0158cc2e23f228715182a946ddfd6268bd6fc2d8 (diff) | |
| download | brew-5821572b9b14b682feaec3f0c42afdba61a821b2.tar.bz2 | |
formula_installer: don't assume requirement dependency is default formula.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 24c068460..66bd60c37 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -370,8 +370,8 @@ class FormulaInstaller raise UnsatisfiedRequirements, fatals end - def install_requirement_default_formula?(req, dependent, build) - return false unless req.default_formula? + def install_requirement_formula?(req, dependent, build) + return false unless req.to_dependency return true unless req.satisfied? return false if req.run? install_bottle_for?(dependent, build) || build_bottle? @@ -390,7 +390,7 @@ class FormulaInstaller Requirement.prune elsif req.build? && install_bottle_for?(dependent, build) Requirement.prune - elsif install_requirement_default_formula?(req, dependent, build) + elsif install_requirement_formula?(req, dependent, build) dep = req.to_dependency deps.unshift(dep) formulae.unshift(dep.to_formula) |
