Remove unused TapFormulaWithOldnameAmbiguityError.
This commit is contained in:
parent
177e9163c2
commit
b717f5d954
@ -130,7 +130,7 @@ module Homebrew
|
|||||||
|
|
||||||
formula = begin
|
formula = begin
|
||||||
Formulary.from_rack(HOMEBREW_CELLAR/formula_name)
|
Formulary.from_rack(HOMEBREW_CELLAR/formula_name)
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -300,7 +300,7 @@ module Homebrew
|
|||||||
args.each do |arg|
|
args.each do |arg|
|
||||||
formula = begin
|
formula = begin
|
||||||
Formulary.resolve(arg)
|
Formulary.resolve(arg)
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -733,8 +733,7 @@ module Homebrew
|
|||||||
rescue FormulaUnreadableError, FormulaClassUnavailableError,
|
rescue FormulaUnreadableError, FormulaClassUnavailableError,
|
||||||
TapFormulaUnreadableError, TapFormulaClassUnavailableError => e
|
TapFormulaUnreadableError, TapFormulaClassUnavailableError => e
|
||||||
formula_unavailable_exceptions << e
|
formula_unavailable_exceptions << e
|
||||||
rescue FormulaUnavailableError,
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
return if formula_unavailable_exceptions.empty?
|
return if formula_unavailable_exceptions.empty?
|
||||||
@ -752,7 +751,7 @@ module Homebrew
|
|||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
Formulary.from_rack(rack).keg_only?
|
Formulary.from_rack(rack).keg_only?
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -277,27 +277,6 @@ class TapFormulaAmbiguityError < RuntimeError
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Raised when a formula's old name in a specific tap is found in multiple taps.
|
|
||||||
class TapFormulaWithOldnameAmbiguityError < RuntimeError
|
|
||||||
attr_reader :name, :possible_tap_newname_formulae, :taps
|
|
||||||
|
|
||||||
def initialize(name, possible_tap_newname_formulae)
|
|
||||||
@name = name
|
|
||||||
@possible_tap_newname_formulae = possible_tap_newname_formulae
|
|
||||||
|
|
||||||
@taps = possible_tap_newname_formulae.map do |newname|
|
|
||||||
newname =~ HOMEBREW_TAP_FORMULA_REGEX
|
|
||||||
"#{Regexp.last_match(1)}/#{Regexp.last_match(2)}"
|
|
||||||
end
|
|
||||||
|
|
||||||
super <<~EOS
|
|
||||||
Formulae with '#{name}' old name found in multiple taps: #{taps.map { |t| "\n * #{t}" }.join}
|
|
||||||
|
|
||||||
Please use the fully-qualified name (e.g. #{taps.first}/#{name}) to refer to the formula or use its new name.
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Raised when a tap is unavailable.
|
# Raised when a tap is unavailable.
|
||||||
class TapUnavailableError < RuntimeError
|
class TapUnavailableError < RuntimeError
|
||||||
attr_reader :name
|
attr_reader :name
|
||||||
|
|||||||
@ -1318,7 +1318,7 @@ class Formula
|
|||||||
f = 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
|
||||||
return false # this keg belongs to another formula
|
return false # this keg belongs to another formula
|
||||||
else
|
else
|
||||||
# this keg belongs to another unrelated formula
|
# this keg belongs to another unrelated formula
|
||||||
|
|||||||
@ -64,8 +64,7 @@ module Homebrew
|
|||||||
|
|
||||||
unversioned_formula = begin
|
unversioned_formula = begin
|
||||||
Formulary.factory(full_name).path
|
Formulary.factory(full_name).path
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError,
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
TapFormulaWithOldnameAmbiguityError
|
|
||||||
Pathname.new formula.path.to_s.gsub(/@.*\.rb$/, ".rb")
|
Pathname.new formula.path.to_s.gsub(/@.*\.rb$/, ".rb")
|
||||||
end
|
end
|
||||||
unless unversioned_formula.exist?
|
unless unversioned_formula.exist?
|
||||||
@ -285,9 +284,6 @@ module Homebrew
|
|||||||
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 dep_f.oldnames.include?(dep.name.split("/").last)
|
if dep_f.oldnames.include?(dep.name.split("/").last)
|
||||||
@ -461,7 +457,7 @@ module Homebrew
|
|||||||
next
|
next
|
||||||
rescue FormulaUnavailableError
|
rescue FormulaUnavailableError
|
||||||
problem "Can't find conflicting formula #{conflict.name.inspect}."
|
problem "Can't find conflicting formula #{conflict.name.inspect}."
|
||||||
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
rescue TapFormulaAmbiguityError
|
||||||
problem "Ambiguous conflicting formula #{conflict.name.inspect}."
|
problem "Ambiguous conflicting formula #{conflict.name.inspect}."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -990,7 +990,7 @@ module Formulary
|
|||||||
# Return whether given rack is keg-only.
|
# Return whether given rack is keg-only.
|
||||||
def self.keg_only?(rack)
|
def self.keg_only?(rack)
|
||||||
Formulary.from_rack(rack).keg_only?
|
Formulary.from_rack(rack).keg_only?
|
||||||
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
|
rescue FormulaUnavailableError, TapFormulaAmbiguityError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user