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

link_overwrite: allow to overwrite files from alias

Browse Source 
See https://github.com/Homebrew/homebrew-core/pull/54912#issuecomment-653893645
Formulary.factory("python") points to python@3.8, which breaks link_overwrite
for that case.

This changes checks if the formula is an alias, so that we can still override
the files during installation.
This commit is contained in:
Michka Popoff 2020-07-05 22:24:03 +02:00
parent 505c1e7240
commit 5eae33b59d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula.rb
View File

@ -1112,13 +1112,15 @@ class Formula
return false if tab_tap.nil? return false if tab_tap.nil?
begin begin
Formulary.factory(keg.name) f = Formulary.factory(keg.name)
rescue FormulaUnavailableError rescue FormulaUnavailableError
# formula for this keg is deleted, so defer to allowlist # formula for this keg is deleted, so defer to allowlist
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
return false # this keg belongs to another formula return false # this keg belongs to another formula
else else
return false # this keg belongs to another formula # this keg belongs to another formula
# but it is not an alias
return false unless f.aliases.include? keg.name
end end
end end
to_check = path.relative_path_from(HOMEBREW_PREFIX).to_s to_check = path.relative_path_from(HOMEBREW_PREFIX).to_s