From a24197bcc995781caa14855fecf7f31ac0ac43d8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 14 Jan 2019 16:47:07 +0000 Subject: [PATCH] Fix some bottling logic - We've never supported `devel` bottles so don't bother outputting their status to `brew info` - Don't `brew upgrade` or `brew reinstall` bottles if they were previously built as a bottle unless there's no bottles defined at all (rather than there was no compatible bottles). Fixes #5532. --- Library/Homebrew/cmd/info.rb | 4 +--- Library/Homebrew/cmd/upgrade.rb | 2 +- Library/Homebrew/reinstall.rb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 23c8beda65..ce72549531 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -174,9 +174,7 @@ module Homebrew end if devel = f.devel - s = "devel #{devel.version}" - s += " (bottled)" if devel.bottled? - specs << s + specs << "devel #{devel.version}" end specs << "HEAD" if f.head diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 28635b3fab..fd84995b72 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -147,7 +147,7 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = options - fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?) + fi.build_bottle = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?) fi.installed_on_request = !ARGV.named.empty? fi.link_keg ||= keg_was_linked if keg_had_linked_opt if tab diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index 33f7c37b6a..98bdd0b137 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -21,7 +21,7 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = options fi.invalid_option_names = build_options.invalid_option_names - fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?) + fi.build_bottle = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?) fi.interactive = ARGV.interactive? fi.git = ARGV.git? fi.link_keg ||= keg_was_linked if keg_had_linked_opt