Bottles: use options hash for install_bottle?

2 files changed, 8 insertions, 7 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index e067df471..47aa75ffc 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -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
 
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index ba655e307..d6f105d7d 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -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