diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb index 1b2b246919..7aecbe494f 100644 --- a/Library/Homebrew/exceptions.rb +++ b/Library/Homebrew/exceptions.rb @@ -56,7 +56,7 @@ end class FormulaSpecificationError < StandardError; end -class FormulaMethodDeprecatedError < StandardError; end +class MethodDeprecatedError < StandardError; end class FormulaUnavailableError < RuntimeError attr_reader :name diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb index 81e15d314f..d9a082399f 100644 --- a/Library/Homebrew/formula_versions.rb +++ b/Library/Homebrew/formula_versions.rb @@ -4,7 +4,7 @@ class FormulaVersions IGNORED_EXCEPTIONS = [ ArgumentError, NameError, SyntaxError, TypeError, FormulaSpecificationError, FormulaValidationError, - ErrorDuringExecution, LoadError, FormulaMethodDeprecatedError + ErrorDuringExecution, LoadError, MethodDeprecatedError ].freeze attr_reader :name, :path, :repository, :entry_name diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb index cd5a379ab4..3eeb7ce9dd 100644 --- a/Library/Homebrew/test/test_utils.rb +++ b/Library/Homebrew/test/test_utils.rb @@ -249,7 +249,7 @@ class UtilTests < Homebrew::TestCase def test_odeprecated ARGV.stubs(:homebrew_developer?).returns false - e = assert_raises(FormulaMethodDeprecatedError) do + e = assert_raises(MethodDeprecatedError) do odeprecated("method", "replacement", caller: ["#{HOMEBREW_LIBRARY}/Taps/homebrew/homebrew-core/"], die: true) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index fbe603b912..79e5287e86 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -83,7 +83,7 @@ def odeprecated(method, replacement = nil, options = {}) if ARGV.homebrew_developer? || options[:die] || Homebrew.raise_deprecation_exceptions? - raise FormulaMethodDeprecatedError, message + raise MethodDeprecatedError, message else opoo "#{message}\n" end