From 8b9a3a560f93b1a1f42dcae83240ffddb6763be0 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 9 Jun 2013 13:44:59 -0500
Subject: Separate formula conflicts from requirements

Closes Homebrew/homebrew#20357.
---
 Library/Homebrew/cmd/audit.rb | 6 +++---
 Library/Homebrew/cmd/info.rb  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 302758065..5bb9c2df0 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -174,11 +174,11 @@ class FormulaAuditor
   end
 
   def audit_conflicts
-    f.conflicts.each do |req|
+    f.conflicts.each do |c|
       begin
-        Formula.factory req.formula
+        Formula.factory(c.name)
       rescue FormulaUnavailableError
-        problem "Can't find conflicting formula \"#{req.formula}\"."
+        problem "Can't find conflicting formula #{c.name.inspect}."
       end
     end
   end
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 7abe9ec67..67a009877 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -102,7 +102,7 @@ module Homebrew extend self
       puts
     end
 
-    conflicts = f.conflicts.map(&:formula).sort!
+    conflicts = f.conflicts.map(&:name).sort!
     puts "Conflicts with: #{conflicts*', '}" unless conflicts.empty?
 
     if f.rack.directory?
-- 
cgit v1.2.3