admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify printing conflicts in brew info

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-08-07 14:22:20 -05:00
parent 82d3890495
commit 4f809d0311
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/cmd/info.rb
View File

@ -68,10 +68,7 @@ module Homebrew extend self
end end
puts "Depends on: #{f.deps*', '}" unless f.deps.empty? puts "Depends on: #{f.deps*', '}" unless f.deps.empty?
conflicts = [] conflicts = f.conflicts.map { |c| c.formula }
f.requirements.each do |dep|
conflicts << dep.formula if dep.is_a? ConflictRequirement
end
puts "Conflicts with: #{conflicts*', '}" unless conflicts.empty? puts "Conflicts with: #{conflicts*', '}" unless conflicts.empty?
if f.rack.directory? if f.rack.directory?

4
Library/Homebrew/formula.rb
View File

@ -425,6 +425,10 @@ class Formula
def deps; self.class.dependencies.deps; end def deps; self.class.dependencies.deps; end
def requirements; self.class.dependencies.requirements; end def requirements; self.class.dependencies.requirements; end
def conflicts
requirements.select { |r| r.is_a? ConflictRequirement }
end
# deps are in an installable order # deps are in an installable order
# which means if a depends on b then b will be ordered before a in this list # which means if a depends on b then b will be ordered before a in this list
def recursive_deps def recursive_deps