diff options
| author | Jack Nagel | 2014-03-10 14:56:02 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-10 14:56:02 -0500 |
| commit | 307caebc088eafb8971a44e8130ace75ce801e17 (patch) | |
| tree | 93334b450f03efd693286f4dd125c91aaab859cc | |
| parent | a82d2f1f2d8075ec5f62d442418b5c64c4d888d6 (diff) | |
| download | homebrew-307caebc088eafb8971a44e8130ace75ce801e17.tar.bz2 | |
Make force_bottle an explicit installer mode
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 183a78040..8a13397b2 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -109,6 +109,7 @@ module Homebrew extend self fi.only_deps = ARGV.only_deps? fi.build_bottle = ARGV.build_bottle? fi.build_from_source = ARGV.build_from_source? + fi.force_bottle = ARGV.force_bottle? fi.prelude fi.install fi.caveats diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index a6e5a71b4..b65baf8fd 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -18,7 +18,7 @@ class FormulaInstaller attr_reader :f attr_accessor :options, :ignore_deps, :only_deps attr_accessor :show_summary_heading, :show_header - attr_accessor :build_from_source, :build_bottle + attr_accessor :build_from_source, :build_bottle, :force_bottle def initialize ff @f = ff @@ -27,6 +27,7 @@ class FormulaInstaller @only_deps = false @build_from_source = false @build_bottle = false + @force_bottle = false @options = Options.new @@attempted ||= Set.new @@ -37,11 +38,11 @@ class FormulaInstaller def pour_bottle? install_bottle_options={:warn=>false} return false if @pour_failed + return true if force_bottle && f.bottle return false if build_from_source || build_bottle 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? |