admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix some bottling logic

Browse Source 
- 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.
This commit is contained in:
Mike McQuaid 2019-01-14 16:47:07 +00:00
parent 01a8fda807
commit a24197bcc9
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/info.rb
View File

@ -174,9 +174,7 @@ module Homebrew
end end
if devel = f.devel if devel = f.devel
s = "devel #{devel.version}" specs << "devel #{devel.version}"
s += " (bottled)" if devel.bottled?
specs << s
end end
specs << "HEAD" if f.head specs << "HEAD" if f.head

2
Library/Homebrew/cmd/upgrade.rb
View File

@ -147,7 +147,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = options 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.installed_on_request = !ARGV.named.empty?
fi.link_keg ||= keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt
if tab if tab

2
Library/Homebrew/reinstall.rb
View File

@ -21,7 +21,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = options fi.options = options
fi.invalid_option_names = build_options.invalid_option_names 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.interactive = ARGV.interactive?
fi.git = ARGV.git? fi.git = ARGV.git?
fi.link_keg ||= keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt