From b6cca78e05098257744676369391579d4a83f923 Mon Sep 17 00:00:00 2001 From: Larry Shaffer Date: Fri, 15 Aug 2014 16:56:13 -0600 Subject: [PATCH] Upgrade honors build_bottle? and built_as_bottle options Closes Homebrew/homebrew#31628. Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/upgrade.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 4d78e9fa16..ae8ba2c734 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -49,9 +49,12 @@ module Homebrew def upgrade_formula f outdated_keg = Keg.new(f.linked_keg.resolved_path) if f.linked_keg.directory? + tab = Tab.for_formula(f) fi = FormulaInstaller.new(f) - fi.options = Tab.for_formula(f).used_options + fi.options = tab.used_options + fi.build_bottle = ARGV.build_bottle? + fi.build_bottle ||= tab.built_as_bottle && !tab.poured_from_bottle fi.build_from_source = ARGV.build_from_source? fi.verbose = ARGV.verbose? fi.verbose &&= :quieter if ARGV.quieter?