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

Fix tag_to_cellar

Browse Source
This commit is contained in:
Douglas Eichelberger 2023-11-05 12:23:42 -08:00
parent ca90f9866a
commit 3c0506e276
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/software_spec.rb
View File

@ -541,11 +541,11 @@ class BottleSpecification
end end
alias eql? == alias eql? ==
sig { params(tag: Utils::Bottles::Tag).returns(String) } sig { params(tag: Utils::Bottles::Tag).returns(T.any(Symbol, String)) }
def tag_to_cellar(tag = Utils::Bottles.tag) def tag_to_cellar(tag = Utils::Bottles.tag)
spec = collector.specification_for(tag) spec = collector.specification_for(tag)
if spec.present? if spec.present?
spec.cellar.to_s spec.cellar
else else
tag.default_cellar tag.default_cellar
end end
@ -557,7 +557,7 @@ class BottleSpecification
return true if RELOCATABLE_CELLARS.include?(cellar) return true if RELOCATABLE_CELLARS.include?(cellar)
prefix = Pathname(cellar).parent.to_s prefix = Pathname(cellar.to_s).parent.to_s
cellar_relocatable = cellar.size >= HOMEBREW_CELLAR.to_s.size && ENV["HOMEBREW_RELOCATE_BUILD_PREFIX"].present? cellar_relocatable = cellar.size >= HOMEBREW_CELLAR.to_s.size && ENV["HOMEBREW_RELOCATE_BUILD_PREFIX"].present?
prefix_relocatable = prefix.size >= HOMEBREW_PREFIX.to_s.size && ENV["HOMEBREW_RELOCATE_BUILD_PREFIX"].present? prefix_relocatable = prefix.size >= HOMEBREW_PREFIX.to_s.size && ENV["HOMEBREW_RELOCATE_BUILD_PREFIX"].present?