From fb30041640852f14771ac928f655fb3d17a33926 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 17 Oct 2014 00:11:46 -0500 Subject: [PATCH] audit: loop over deps once --- Library/Homebrew/cmd/audit.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 88b3a819c2..a0359ae075 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -114,16 +114,10 @@ class FormulaAuditor end end + @@aliases ||= Formula.aliases + def audit_deps - # Don't depend_on aliases; use full name - @@aliases ||= Formula.aliases - @specs.each do |spec| - spec.deps.select { |d| @@aliases.include? d.name }.each do |d| - real_name = d.to_formula.name - problem "Dependency '#{d}' is an alias; use the canonical name '#{real_name}'." - end - # Check for things we don't like to depend on. # We allow non-Homebrew installs whenever possible. spec.deps.each do |dep| @@ -137,6 +131,10 @@ class FormulaAuditor next end + if @@aliases.include?(dep.name) + problem "Dependency '#{dep.name}' is an alias; use the canonical name '#{dep.to_formula.name}'." + end + dep.options.reject do |opt| next true if dep_f.option_defined?(opt) dep_f.requirements.detect do |r|