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

Test default formula requirements against correct dependent

Browse Source
This commit is contained in:
Jack Nagel 2014-10-29 00:36:13 -05:00
parent 27f2aa5f2c
commit f90e303fb9
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

@ -235,11 +235,11 @@ class FormulaInstaller
raise UnsatisfiedRequirements.new(fatals) unless fatals.empty? raise UnsatisfiedRequirements.new(fatals) unless fatals.empty?
end end
def install_requirement_default_formula?(req, build) def install_requirement_default_formula?(req, dependent, build)
return false unless req.default_formula? return false unless req.default_formula?
return false if build.without?(req) && (req.recommended? || req.optional?) return false if build.without?(req) && (req.recommended? || req.optional?)
return true unless req.satisfied? return true unless req.satisfied?
pour_bottle? || build_bottle? install_bottle_for?(dependent, build) || build_bottle?
end end
def expand_requirements def expand_requirements
@ -256,7 +256,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, build) elsif install_requirement_default_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)