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

Bottles: use options hash for install_bottle?

Browse Source
This commit is contained in:
Mike McQuaid 2013-09-18 12:36:43 +01:00
parent 1390d5cc12
commit a7e1dbae63
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/bottles.rb
View File

@ -3,8 +3,6 @@ require 'macos'
require 'extend/ARGV'
require 'bottle_version'
# TODO: use options={} for some arguments.
def bottle_filename f, bottle_revision=nil
name = f.name.downcase
version = f.stable.version
@ -12,7 +10,7 @@ def bottle_filename f, bottle_revision=nil
"#{name}-#{version}#{bottle_native_suffix(bottle_revision)}"
end
def install_bottle? f, warn=false
def install_bottle? f, options={:warn=>false}
return true if f.downloader and defined? f.downloader.local_bottle_path \
and f.downloader.local_bottle_path
@ -22,7 +20,9 @@ def install_bottle? f, warn=false
return false unless f.build.used_options.empty?
return false unless bottle_current?(f)
if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" if warn
if options[:warn]
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
end
return false
end

7
Library/Homebrew/formula_installer.rb
View File

@ -30,8 +30,9 @@ class FormulaInstaller
check_install_sanity
end
def pour_bottle? warn=false
tab.used_options.empty? && options.empty? && install_bottle?(f, warn)
def pour_bottle? install_bottle_options={:warn=>false}
tab.used_options.empty? && options.empty? && \
install_bottle?(f, install_bottle_options)
end
def check_install_sanity
@ -167,7 +168,7 @@ class FormulaInstaller
@poured_bottle = false
begin
if pour_bottle? true
if pour_bottle? :warn => true
pour
@poured_bottle = true
tab = Tab.for_keg f.prefix