Make build_from_source an explicit installer mode

cmar · Mar 10, 2014 · ca31256 · ca31256
1 parent 8887913
commit ca31256
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
@@ -13,7 +13,6 @@ def bottle_filename f, options={}
 
 def install_bottle? f, options={:warn=>false}
   return true if f.local_bottle_path
-  return false if ARGV.build_from_source?
   return true if ARGV.force_bottle?
   return false unless f.pour_bottle?
   return false unless f.default_build?

diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
@@ -107,6 +107,7 @@ def install_formula f
     fi.ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
     fi.only_deps = ARGV.only_deps?
     fi.build_bottle = ARGV.build_bottle?
+    fi.build_from_source = ARGV.build_from_source?
     fi.prelude
     fi.install
     fi.caveats

diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
@@ -60,6 +60,7 @@ def upgrade_formula f
     installer.options |= Tab.for_formula(f).used_options
     installer.show_header = false
     installer.ignore_deps = false
+    installer.build_from_source = ARGV.build_from_source?
     installer.prelude
 
     oh1 "Upgrading #{f.name}"