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

Only treat symlinks in taps as alias paths.

Browse Source 
Fixes https://github.com/Homebrew/homebrew-core/issues/162946.
This commit is contained in:
Markus Reiter 2024-02-16 22:23:41 +01:00
parent e0743a1436
commit 964f005b3e
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Library/Homebrew/formulary.rb
View File

@ -599,28 +599,42 @@ module Formulary
return unless path.expand_path.exist?
options = if path.symlink?
alias_path = path
path = alias_path.resolved_path
{ alias_path: alias_path }
options = if (tap = Tap.from_path(path))
# Only treat symlinks in taps as aliases.
if path.symlink?
alias_path = path
path = alias_path.resolved_path
{
alias_path: alias_path,
tap: tap,
}
else
{
tap: tap,
}
end
elsif (tap = Homebrew::API.tap_from_source_download(path))
# Don't treat cache symlinks as aliases.
{
tap: tap,
}
else
{}
end
end
return if path.extname != ".rb"
new(path, **options)
end
end
sig { params(path: T.any(Pathname, String), alias_path: Pathname).void }
def initialize(path, alias_path: T.unsafe(nil))
sig { params(path: T.any(Pathname, String), alias_path: Pathname, tap: Tap).void }
def initialize(path, alias_path: T.unsafe(nil), tap: T.unsafe(nil))
path = Pathname(path).expand_path
name = path.basename(".rb").to_s
alias_path = alias_path&.expand_path
alias_dir = alias_path&.dirname
tap = Tap.from_path(path) || Homebrew::API.tap_from_source_download(path)
options = {
alias_path: (alias_path if alias_dir == tap&.alias_dir),
tap: tap,