From e960ccdf18fb1c6b0fe120b87378453df096e44d Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Fri, 2 Mar 2018 06:42:24 +0000 Subject: [PATCH 1/3] utils: stop suggesting fixing hard deprecations --- Library/Homebrew/utils.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 03924dcef2..9b0d8be13b 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -109,7 +109,11 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call if ARGV.homebrew_developer? || disable || Homebrew.raise_deprecation_exceptions? - developer_message = message + "Or, even better, submit a PR to fix it!" + if replacement_message != "There is no replacement." + developer_message = message + "Or, even better, submit a PR to fix it!" + else + developer_message = message + end raise MethodDeprecatedError, developer_message elsif !Homebrew.auditing? opoo "#{message}\n" From 8668b7108ae96ef64f44d3d789247b0cf53d1d53 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Fri, 2 Mar 2018 07:10:31 +0000 Subject: [PATCH 2/3] utils: stop suggesting fixing hard deprecations tweak --- Library/Homebrew/utils.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 9b0d8be13b..88abd53f89 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -109,10 +109,12 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call if ARGV.homebrew_developer? || disable || Homebrew.raise_deprecation_exceptions? - if replacement_message != "There is no replacement." - developer_message = message + "Or, even better, submit a PR to fix it!" - else + if caller_message.match?(HOMEBREW_LIBRARY_PATH/"cmd") || + caller_message.match?(HOMEBREW_LIBRARY_PATH/"dev-cmd") && + replacement_message == "There is no replacement." developer_message = message + else + developer_message = message + "Or, even better, submit a PR to fix it!" end raise MethodDeprecatedError, developer_message elsif !Homebrew.auditing? From 8860402f8fcb81e9f9630fd4fac19da7c7703f52 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 8 Mar 2018 08:22:47 +0000 Subject: [PATCH 3/3] utils: only try and replace tap or replaced methods. --- Library/Homebrew/utils.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 88abd53f89..3de0c8dfe2 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -109,11 +109,7 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call if ARGV.homebrew_developer? || disable || Homebrew.raise_deprecation_exceptions? - if caller_message.match?(HOMEBREW_LIBRARY_PATH/"cmd") || - caller_message.match?(HOMEBREW_LIBRARY_PATH/"dev-cmd") && - replacement_message == "There is no replacement." - developer_message = message - else + if replacement || tap developer_message = message + "Or, even better, submit a PR to fix it!" end raise MethodDeprecatedError, developer_message