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

Reduce explicit branches in dependency expansion

Browse Source
This commit is contained in:
Jack Nagel 2014-10-29 00:28:29 -05:00
parent ad4edb94d7
commit 27f2aa5f2c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/formula_installer.rb
View File

@ -69,7 +69,8 @@ class FormulaInstaller
true
end
def install_bottle_for_dep?(dep, build)
def install_bottle_for?(dep, build)
return pour_bottle? if dep == f
return false if build_from_source?
return false unless dep.bottle && dep.pour_bottle?
return false unless build.used_options.empty?
@ -253,9 +254,7 @@ class FormulaInstaller
if (req.optional? || req.recommended?) && build.without?(req)
Requirement.prune
elsif req.build? && dependent == self.f && pour_bottle?
Requirement.prune
elsif req.build? && dependent != self.f && install_bottle_for_dep?(dependent, build)
elsif req.build? && install_bottle_for?(dependent, build)
Requirement.prune
elsif install_requirement_default_formula?(req, build)
dep = req.to_dependency
@ -285,9 +284,7 @@ class FormulaInstaller
if (dep.optional? || dep.recommended?) && build.without?(dep)
Dependency.prune
elsif dep.build? && dependent == f && pour_bottle?
Dependency.prune
elsif dep.build? && dependent != f && install_bottle_for_dep?(dependent, build)
elsif dep.build? && install_bottle_for?(dependent, build)
Dependency.prune
elsif dep.satisfied?(options)
Dependency.skip