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

Rename "exact" tag match to "no_older_versions"

Browse Source 
This is more specific about the behaviour we want to have in future.
This commit is contained in:
Mike McQuaid 2021-04-08 14:58:39 +01:00
parent 7a0de03d82
commit 6b5213286c
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,7 +344,7 @@ module Homebrew
end
end
_, _, bottle_cellar = Formula[f.name].bottle_specification.checksum_for(bottle_tag, exact: true)
_, _, bottle_cellar = Formula[f.name].bottle_specification.checksum_for(bottle_tag, no_older_versions: true)
relocatable = [:any, :any_skip_relocation].include?(bottle_cellar)
skip_relocation = bottle_cellar == :any_skip_relocation

2
Library/Homebrew/dev-cmd/unbottled.rb
View File

@ -158,7 +158,7 @@ module Homebrew
formulae.each do |f|
name = f.name.downcase
if f.bottle_specification.tag?(@bottle_tag, exact: true)
if f.bottle_specification.tag?(@bottle_tag, no_older_versions: true)
puts "#{Tty.bold}#{Tty.green}#{name}#{Tty.reset}: already bottled" if any_named_args
next
end

6
Library/Homebrew/extend/os/mac/utils/bottles.rb
View File

@ -16,10 +16,10 @@ module Utils
alias generic_find_matching_tag find_matching_tag
def find_matching_tag(tag, exact: false)
def find_matching_tag(tag, no_older_versions: false)
# Used primarily by developers testing beta macOS releases.
if exact || (OS::Mac.prerelease? && Homebrew::EnvConfig.developer? &&
Homebrew::EnvConfig.skip_or_later_bottles?)
if no_older_versions ||
(OS::Mac.prerelease? && Homebrew::EnvConfig.developer? && Homebrew::EnvConfig.skip_or_later_bottles?)
generic_find_matching_tag(tag)
else
generic_find_matching_tag(tag) ||

14
Library/Homebrew/software_spec.rb
View File

@ -495,9 +495,9 @@ class BottleSpecification
cellar == :any_skip_relocation
end
sig { params(tag: T.any(Symbol, Utils::Bottles::Tag), exact: T::Boolean).returns(T::Boolean) }
def tag?(tag, exact: false)
checksum_for(tag, exact: exact) ? true : false
sig { params(tag: T.any(Symbol, Utils::Bottles::Tag), no_older_versions: T::Boolean).returns(T::Boolean) }
def tag?(tag, no_older_versions: false)
checksum_for(tag, no_older_versions: no_older_versions) ? true : false
end
# Checksum methods in the DSL's bottle block take
@ -543,14 +543,14 @@ class BottleSpecification
sig {
params(
tag: T.any(Symbol, Utils::Bottles::Tag),
exact: T::Boolean,
tag: T.any(Symbol, Utils::Bottles::Tag),
no_older_versions: T::Boolean,
).returns(
T.nilable([Checksum, Symbol, T.any(Symbol, String)]),
)
}
def checksum_for(tag, exact: false)
collector.fetch_checksum_for(tag, exact: exact)
def checksum_for(tag, no_older_versions: false)
collector.fetch_checksum_for(tag, no_older_versions: no_older_versions)
end
def checksums

10
Library/Homebrew/utils/bottles.rb
View File

@ -204,21 +204,21 @@ module Utils
sig {
params(
tag: T.any(Symbol, Utils::Bottles::Tag),
exact: T::Boolean,
tag: T.any(Symbol, Utils::Bottles::Tag),
no_older_versions: T::Boolean,
).returns(
T.nilable([Checksum, Symbol, T.any(Symbol, String)]),
)
}
def fetch_checksum_for(tag, exact: false)
def fetch_checksum_for(tag, no_older_versions: false)
tag = Utils::Bottles::Tag.from_symbol(tag) if tag.is_a?(Symbol)
tag = find_matching_tag(tag, exact: exact)&.to_sym
tag = find_matching_tag(tag, no_older_versions: no_older_versions)&.to_sym
return self[tag][:checksum], tag, self[tag][:cellar] if tag
end
private
def find_matching_tag(tag, exact: false)
def find_matching_tag(tag, no_older_versions: false)
tag if key?(tag.to_sym)
end
end