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

Inline install_bottle? logic into the installer

Browse Source
This commit is contained in:
Jack Nagel 2014-03-10 14:56:02 -05:00
parent 32ab18c189
commit 7b6fa8b7bb
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/bottles.rb
View File

@ -8,22 +8,6 @@ def bottle_filename options={}
"#{options[:name]}-#{options[:version]}#{bottle_native_suffix(options)}" "#{options[:name]}-#{options[:version]}#{bottle_native_suffix(options)}"
end end
def install_bottle? f, options={:warn=>false}
return true if f.local_bottle_path
return true if ARGV.force_bottle?
return false unless f.pour_bottle?
return false unless f.bottle
unless f.bottle.compatible_cellar?
if options[:warn]
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
end
return false
end
true
end
def built_as_bottle? f def built_as_bottle? f
return false unless f.installed? return false unless f.installed?
tab = Tab.for_keg(f.installed_prefix) tab = Tab.for_keg(f.installed_prefix)

29
Library/Homebrew/formula_installer.rb
View File

@ -38,7 +38,28 @@ class FormulaInstaller
def pour_bottle? install_bottle_options={:warn=>false} def pour_bottle? install_bottle_options={:warn=>false}
return false if @pour_failed return false if @pour_failed
return false if build_from_source || build_bottle return false if build_from_source || build_bottle
options.empty? && install_bottle?(f, install_bottle_options) return false unless options.empty?
return true if f.local_bottle_path
return true if ARGV.force_bottle?
return false unless f.bottle && f.pour_bottle?
unless f.bottle.compatible_cellar?
if install_bottle_options[:warn]
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
end
return false
end
true
end
def install_bottle_for_dep?(dep, build)
return false if build_from_source
return false unless dep.bottle && dep.pour_bottle?
return false unless build.used_options.empty?
return false unless dep.bottle.compatible_cellar?
return true
end end
def prelude def prelude
@ -227,7 +248,9 @@ class FormulaInstaller
if (req.optional? || req.recommended?) && build.without?(req) if (req.optional? || req.recommended?) && build.without?(req)
Requirement.prune Requirement.prune
elsif req.build? && install_bottle?(dependent) elsif req.build? && dependent == f && pour_bottle?
Requirement.prune
elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build)
Requirement.prune Requirement.prune
elsif req.satisfied? elsif req.satisfied?
Requirement.prune Requirement.prune
@ -258,7 +281,7 @@ class FormulaInstaller
Dependency.prune Dependency.prune
elsif dep.build? && dependent == f && pour_bottle? elsif dep.build? && dependent == f && pour_bottle?
Dependency.prune Dependency.prune
elsif dep.build? && dependent != f && install_bottle?(dependent) elsif dep.build? && dependent != f && install_bottle_for_dep?(dependent, build)
Dependency.prune Dependency.prune
elsif dep.satisfied?(options) elsif dep.satisfied?(options)
Dependency.skip Dependency.skip