diff options
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/reinstall.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/tab.rb | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index 113607236..b72fbad09 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -20,8 +20,7 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = options - fi.build_bottle = ARGV.build_bottle? - fi.build_bottle ||= tab.built_as_bottle && !tab.poured_from_bottle + fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_from_source = ARGV.build_from_source? fi.force_bottle = ARGV.force_bottle? fi.verbose = ARGV.verbose? diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 8f1b7fabe..c5b875d31 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -53,8 +53,7 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = tab.used_options - fi.build_bottle = ARGV.build_bottle? - fi.build_bottle ||= tab.built_as_bottle && !tab.poured_from_bottle + fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_from_source = ARGV.build_from_source? fi.verbose = ARGV.verbose? fi.verbose &&= :quieter if ARGV.quieter? diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index ea619d57c..96639fb20 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -121,6 +121,10 @@ class Tab < OpenStruct CxxStdlib.create(lib, cc.to_sym) end + def build_bottle? + built_as_bottle && !poured_from_bottle + end + def to_json Utils::JSON.dump({ :used_options => used_options.as_flags, |