admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils: reduce odeprecated warnings.

Browse Source 
Fix the code so we don't actually output `odeprecated` warnings for
`HOMEBREW_CACHE`d or `.brew`d formulae.
This commit is contained in:
Mike McQuaid 2018-01-24 09:02:00 +00:00
parent e056e85078
commit 459b113e28
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/utils.rb
View File

@ -82,6 +82,12 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call
# - Location of caller of deprecated method (if all else fails). # - Location of caller of deprecated method (if all else fails).
backtrace = caller backtrace = caller
tap_message = nil tap_message = nil
# Don't throw deprecations at all for cached or .brew formulae.
return if backtrace.any? do |line|
line.include?(HOMEBREW_CACHE) || line.include?("/.brew/")
end
caller_message = backtrace.detect do |line| caller_message = backtrace.detect do |line|
next unless line =~ %r{^#{Regexp.escape(HOMEBREW_LIBRARY)}/Taps/([^/]+/[^/]+)/} next unless line =~ %r{^#{Regexp.escape(HOMEBREW_LIBRARY)}/Taps/([^/]+/[^/]+)/}
tap = Tap.fetch Regexp.last_match(1) tap = Tap.fetch Regexp.last_match(1)
@ -89,9 +95,6 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call
true true
end end
caller_message ||= backtrace.detect do |line| caller_message ||= backtrace.detect do |line|
# Don't throw deprecations at all for cached or .brew formulae.
next false if line.include?(HOMEBREW_CACHE)
next false if line.include?("/.brew/")
!line.start_with?("#{HOMEBREW_LIBRARY_PATH}/compat/") !line.start_with?("#{HOMEBREW_LIBRARY_PATH}/compat/")
end end
caller_message ||= backtrace[1] caller_message ||= backtrace[1]