From d5006ef01232cb2fc9829d3d07871d683f0202af Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 13 May 2017 13:00:00 +0100 Subject: [PATCH] audit: fix dependency option detection. Instead of trying to do this all with a single regex give up and do a two stage process. Eventually I'll end up implementing a full ruby parser here :troll:. --- Library/Homebrew/dev-cmd/audit.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index cb25ca7943..4ad302d5da 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1036,8 +1036,12 @@ class FormulaAuditor problem "#{$2} modules should be vendored rather than use deprecated `depends_on \"#{$1}\" => :#{$2}#{$3}`" end - if line =~ /depends_on\s+['"](.+)['"]\s+=>\s+.*(?\s+(.*)/ + dep = $1 + $2.split(" ").map do |o| + next unless o =~ /^\[?['"](.*)['"]/ + problem "Dependency #{dep} should not use option #{$1}" + end end # Commented-out depends_on