From 8bd619e03b17f603027b0724e3d018dd241b6d23 Mon Sep 17 00:00:00 2001 From: Jack Nagel <jacknagel@gmail.com> Date: Sat, 6 Apr 2013 22:11:26 -0500 Subject: [PATCH] audit: clean up some regexps --- Library/Homebrew/cmd/audit.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 296e79ceef..8b773345db 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -430,16 +430,17 @@ class FormulaAuditor problem "Use MacOS.version instead of MACOS_VERSION" end - if text =~ /(MacOS.((snow_)?leopard|leopard|(mountain_)?lion)\?)/ - problem "#{$1} is deprecated, use a comparison to MacOS.version instead" + cats = %w{leopard snow_leopard lion mountain_lion}.join("|") + if text =~ /MacOS\.(?:#{cats})\?/ + problem "\"#{$&}\" is deprecated, use a comparison to MacOS.version instead" end if text =~ /skip_clean\s+:all/ problem "`skip_clean :all` is deprecated; brew no longer strips symbols" end - if text =~ /depends_on (.*)\.new$/ - problem "`depends_on` can take requirement classes directly" + if text =~ /depends_on [A-Z][\w:]+\.new$/ + problem "`depends_on` can take requirement classes instead of instances" end end -- GitLab