diff options
| author | Larry Shaffer | 2014-08-15 16:56:13 -0600 |
|---|---|---|
| committer | Jack Nagel | 2014-08-17 15:36:24 -0500 |
| commit | b6cca78e05098257744676369391579d4a83f923 (patch) | |
| tree | 6ee0c55317fce5fb30b340627661fc270d197b96 /Library/Homebrew | |
| parent | 92eb96aca08a22d69d0c7a4455444e9af95acf63 (diff) | |
| download | brew-b6cca78e05098257744676369391579d4a83f923.tar.bz2 | |
Upgrade honors build_bottle? and built_as_bottle options
Closes Homebrew/homebrew#31628.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 4d78e9fa1..ae8ba2c73 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? |