From e091e74c0c4eef1f75ea3dc7ca93a19fac295cdf Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 12 Aug 2016 21:06:00 +0100 Subject: global: add Homebrew.raise_deprecation_exceptions --- Library/Homebrew/global.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Library') diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 9554dd536..f739f5012 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -51,6 +51,9 @@ module Homebrew attr_accessor :failed alias_method :failed?, :failed + + attr_accessor :raise_deprecation_exceptions + alias_method :raise_deprecation_exceptions?, :raise_deprecation_exceptions end HOMEBREW_PULL_API_REGEX = %r{https://api\.github\.com/repos/([\w-]+)/([\w-]+)?/pulls/(\d+)} -- cgit v1.2.3 From c56625f8b76f5e33ac5e086af4c9d3d79c593218 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 12 Aug 2016 21:06:41 +0100 Subject: utils: check raise deprecation exceptions value. --- Library/Homebrew/utils.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index f78fbfcb7..a3a3378b6 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -149,7 +149,8 @@ def odeprecated(method, replacement = nil, options = {}) #{caller_message}#{tap_message} EOS - if ARGV.homebrew_developer? || options[:die] + if ARGV.homebrew_developer? || options[:die] || + Homebrew.raise_deprecation_exceptions? raise FormulaMethodDeprecatedError, message else opoo "#{message}\n" -- cgit v1.2.3 From e0c8c00e879410c6de6062c3de5319e6c073dd04 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 12 Aug 2016 21:06:51 +0100 Subject: formula_versions: set/unset raise_deprecation_exceptions. --- Library/Homebrew/formula_versions.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Library') diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb index de285b642..13cb8ac8c 100644 --- a/Library/Homebrew/formula_versions.rb +++ b/Library/Homebrew/formula_versions.rb @@ -34,6 +34,7 @@ class FormulaVersions contents = file_contents_at_revision(rev) begin + Homebrew.raise_deprecation_exceptions = true nostdout { yield Formulary.from_contents(name, path, contents) } rescue *IGNORED_EXCEPTIONS => e # We rescue these so that we can skip bad versions and @@ -41,6 +42,8 @@ class FormulaVersions ohai "#{e} in #{name} at revision #{rev}", e.backtrace if ARGV.debug? rescue FormulaUnavailableError # Suppress this error + ensure + Homebrew.raise_deprecation_exceptions = false end end -- cgit v1.2.3