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

Merge pull request #16635 from reitermarkus/fix-recursive-tap-migrations

Browse Source 
Stop following recursive tap migrations.
This commit is contained in:
Markus Reiter 2024-02-10 15:20:58 +01:00 committed by GitHub
commit 3cbdc196fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cask/cask_loader.rb
View File

@ -534,10 +534,15 @@ module Cask
new_tap = Tap.fetch(new_tap_name)
new_tap.ensure_installed!
new_tapped_token = "#{new_tap_name}/#{token}"
token, tap, = tap_cask_token_type(new_tapped_token, warn: false)
old_token = tapped_token
new_token = new_tap.core_cask_tap? ? token : new_tapped_token
type = :migration
if tapped_token == new_tapped_token
opoo "Tap migration for #{tapped_token} points to itself, stopping recursion."
else
token, tap, = tap_cask_token_type(new_tapped_token, warn: false)
old_token = tapped_token
new_token = new_tap.core_cask_tap? ? token : new_tapped_token
type = :migration
end
end
opoo "Cask #{old_token} was renamed to #{new_token}." if warn && old_token && new_token

13
Library/Homebrew/formulary.rb
View File

@ -921,10 +921,15 @@ module Formulary
new_tap = Tap.fetch new_tap_name
new_tap.ensure_installed!
new_tapped_name = "#{new_tap_name}/#{name}"
name, tap, = Formulary.tap_formula_name_type(new_tapped_name, warn: false)
old_name = tapped_name
new_name = new_tap.core_tap? ? name : new_tapped_name
type = :migration
if tapped_name == new_tapped_name
opoo "Tap migration for #{tapped_name} points to itself, stopping recursion."
else
name, tap, = tap_formula_name_type(new_tapped_name, warn: false)
old_name = tapped_name
new_name = new_tap.core_tap? ? name : new_tapped_name
type = :migration
end
end
opoo "Formula #{old_name} was renamed to #{new_name}." if warn && old_name && new_name