handle TapFormulaWithOldnameAmbiguityError
Closes Homebrew/homebrew#44705. Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
parent
fde5b48d83
commit
ee332c4550
@ -282,9 +282,12 @@ class FormulaAuditor
|
|||||||
rescue TapFormulaAmbiguityError
|
rescue TapFormulaAmbiguityError
|
||||||
problem "Ambiguous dependency #{dep.name.inspect}."
|
problem "Ambiguous dependency #{dep.name.inspect}."
|
||||||
next
|
next
|
||||||
|
rescue TapFormulaWithOldnameAmbiguityError
|
||||||
|
problem "Ambiguous oldname dependency #{dep.name.inspect}."
|
||||||
|
next
|
||||||
end
|
end
|
||||||
|
|
||||||
if FORMULA_RENAMES[dep.name] == dep_f.name
|
if dep_f.oldname && dep.name.split("/").last == dep_f.oldname
|
||||||
problem "Dependency '#{dep.name}' was renamed; use newname '#{dep_f.name}'."
|
problem "Dependency '#{dep.name}' was renamed; use newname '#{dep_f.name}'."
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -343,7 +346,7 @@ class FormulaAuditor
|
|||||||
next
|
next
|
||||||
rescue FormulaUnavailableError
|
rescue FormulaUnavailableError
|
||||||
problem "Can't find conflicting formula #{c.name.inspect}."
|
problem "Can't find conflicting formula #{c.name.inspect}."
|
||||||
rescue TapFormulaAmbiguityError
|
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
problem "Ambiguous conflicting formula #{c.name.inspect}."
|
problem "Ambiguous conflicting formula #{c.name.inspect}."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -85,7 +85,7 @@ module Homebrew
|
|||||||
|
|
||||||
begin
|
begin
|
||||||
f = Formulary.from_rack(HOMEBREW_CELLAR/name)
|
f = Formulary.from_rack(HOMEBREW_CELLAR/name)
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -1165,7 +1165,7 @@ class Checks
|
|||||||
if !(HOMEBREW_REPOSITORY/"Library/LinkedKegs"/rack.basename).directory?
|
if !(HOMEBREW_REPOSITORY/"Library/LinkedKegs"/rack.basename).directory?
|
||||||
begin
|
begin
|
||||||
Formulary.from_rack(rack).keg_only?
|
Formulary.from_rack(rack).keg_only?
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|||||||
@ -50,7 +50,7 @@ module Homebrew
|
|||||||
|
|
||||||
def keg_only?(rack)
|
def keg_only?(rack)
|
||||||
Formulary.from_rack(rack).keg_only?
|
Formulary.from_rack(rack).keg_only?
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -238,7 +238,7 @@ module Homebrew
|
|||||||
|
|
||||||
def safe_formulary(formula)
|
def safe_formulary(formula)
|
||||||
Formulary.factory formula
|
Formulary.factory formula
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
end
|
end
|
||||||
|
|
||||||
def git(*args)
|
def git(*args)
|
||||||
|
|||||||
@ -1017,7 +1017,7 @@ class Formula
|
|||||||
@installed ||= racks.map do |rack|
|
@installed ||= racks.map do |rack|
|
||||||
begin
|
begin
|
||||||
Formulary.from_rack(rack)
|
Formulary.from_rack(rack)
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
||||||
end
|
end
|
||||||
end.compact
|
end.compact
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user