From 0b685bb8905b096f635e1ac5b3dc468f45eaa828 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 25 Apr 2019 14:01:50 -0700 Subject: [PATCH] upgrade: don't build bottles unnecessarily. Fixes #6063. --- Library/Homebrew/cmd/upgrade.rb | 3 ++- Library/Homebrew/tab.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index c968c5b32a..329276d5b9 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -164,10 +164,11 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = options - fi.build_bottle = args.build_bottle? || (!f.bottle_defined? && f.build.bottle?) + fi.build_bottle = args.build_bottle? fi.installed_on_request = !ARGV.named.empty? fi.link_keg ||= keg_was_linked if keg_had_linked_opt if tab + fi.build_bottle ||= tab.built_bottle? fi.installed_as_dependency = tab.installed_as_dependency fi.installed_on_request ||= tab.installed_on_request end diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index b6a208a6d1..51e4292bb4 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -280,7 +280,7 @@ class Tab < OpenStruct CxxStdlib.create(lib, compiler.to_sym) end - def build_bottle? + def built_bottle? built_as_bottle && !poured_from_bottle end