From 4f809d0311ab6ca8da897d2a9830b9ecbf262d60 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Tue, 7 Aug 2012 14:22:20 -0500
Subject: Simplify printing conflicts in `brew info`

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Homebrew/cmd/info.rb | 5 +----
 Library/Homebrew/formula.rb  | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index c263d3929..265abbec9 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -68,10 +68,7 @@ module Homebrew extend self
     end
 
     puts "Depends on: #{f.deps*', '}" unless f.deps.empty?
-    conflicts = []
-    f.requirements.each do |dep|
-      conflicts << dep.formula if dep.is_a? ConflictRequirement
-    end
+    conflicts = f.conflicts.map { |c| c.formula }
     puts "Conflicts with: #{conflicts*', '}" unless conflicts.empty?
 
     if f.rack.directory?
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index fb0855a17..d78ded9b0 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -425,6 +425,10 @@ class Formula
   def deps;         self.class.dependencies.deps;         end
   def requirements; self.class.dependencies.requirements; end
 
+  def conflicts
+    requirements.select { |r| r.is_a? ConflictRequirement }
+  end
+
   # deps are in an installable order
   # which means if a depends on b then b will be ordered before a in this list
   def recursive_deps
-- 
cgit v1.2.3