aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-03-10 14:56:02 -0500
committerJack Nagel2014-03-10 14:56:02 -0500
commitca31256054b3bcf5407c8b8a8bbcba5b2990ed09 (patch)
treeee5ade626d050bff50756f43f9afbee1e75454bc
parent8887913a09613d933db7309f2d1f819a592a4f14 (diff)
downloadhomebrew-ca31256054b3bcf5407c8b8a8bbcba5b2990ed09.tar.bz2
Make build_from_source an explicit installer mode
-rw-r--r--Library/Homebrew/bottles.rb1
-rw-r--r--Library/Homebrew/cmd/install.rb1
-rw-r--r--Library/Homebrew/cmd/upgrade.rb1
3 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 454fb02b0..fa911d200 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -13,7 +13,6 @@ end
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
index 6a3d370ea..32c82482e 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -107,6 +107,7 @@ module Homebrew extend self
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
index c2c0582a4..548853540 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -60,6 +60,7 @@ module Homebrew extend self
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}"