mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12384 from Bo98/bottle-all-keep-old

Browse Source 
dev-cmd/bottle: don't gen `all` bottles if a bottle spec already exists
This commit is contained in:
Bo Anderson 2021-11-06 03:00:25 +00:00 committed by GitHub
commit f014526f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -624,10 +624,19 @@ module Homebrew
bottle.root_url bottle_hash["bottle"]["root_url"] bottle.root_url bottle_hash["bottle"]["root_url"]
bottle.rebuild bottle_hash["bottle"]["rebuild"] bottle.rebuild bottle_hash["bottle"]["rebuild"]
path = HOMEBREW_REPOSITORY/bottle_hash["formula"]["path"]
formula = Formulary.factory(path)
old_bottle_spec = formula.bottle_specification
old_bottle_spec_matches = old_bottle_spec &&
bottle_hash["formula"]["pkg_version"] == formula.pkg_version.to_s &&
bottle.rebuild != old_bottle_spec.rebuild &&
bottle.root_url == old_bottle_spec.root_url &&
old_bottle_spec.collector.tags.present?
# if all the cellars and checksums are the same: we can create an # if all the cellars and checksums are the same: we can create an
# `all: $SHA256` bottle. # `all: $SHA256` bottle.
tag_hashes = bottle_hash["bottle"]["tags"].values tag_hashes = bottle_hash["bottle"]["tags"].values
all_bottle = (tag_hashes.count > 1) && tag_hashes.uniq do |tag_hash| all_bottle = !old_bottle_spec_matches && (tag_hashes.count > 1) && tag_hashes.uniq do |tag_hash|
"#{tag_hash["cellar"]}-#{tag_hash["sha256"]}" "#{tag_hash["cellar"]}-#{tag_hash["sha256"]}"
end.count == 1 end.count == 1
@ -652,14 +661,7 @@ module Homebrew
next next
end end
path = HOMEBREW_REPOSITORY/bottle_hash["formula"]["path"] no_bottle_changes = if old_bottle_spec_matches
formula = Formulary.factory(path)
old_bottle_spec = formula.bottle_specification
no_bottle_changes = if old_bottle_spec &&
bottle_hash["formula"]["pkg_version"] == formula.pkg_version.to_s &&
bottle.rebuild != old_bottle_spec.rebuild &&
bottle.root_url == old_bottle_spec.root_url
bottle.collector.tags.all? do |tag| bottle.collector.tags.all? do |tag|
tag_spec = bottle.collector.specification_for(tag) tag_spec = bottle.collector.specification_for(tag)
next false if tag_spec.blank? next false if tag_spec.blank?