Merge pull request #6066 from MikeMcQuaid/upgrade-build-bottle-tweaks

upgrade: don't build bottles unnecessarily.

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

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