Upgrade honors build_bottle? and built_as_bottle options

Closes Homebrew/homebrew#31628.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Larry Shaffer 2014-08-15 16:56:13 -06:00 committed by Jack Nagel
parent 92eb96aca0
commit b6cca78e05

View File

@ -49,9 +49,12 @@ module Homebrew
def upgrade_formula f def upgrade_formula f
outdated_keg = Keg.new(f.linked_keg.resolved_path) if f.linked_keg.directory? outdated_keg = Keg.new(f.linked_keg.resolved_path) if f.linked_keg.directory?
tab = Tab.for_formula(f)
fi = FormulaInstaller.new(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.build_from_source = ARGV.build_from_source?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.verbose &&= :quieter if ARGV.quieter? fi.verbose &&= :quieter if ARGV.quieter?