Simplify printing conflicts in brew info
				
					
				
			Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
		
							parent
							
								
									82d3890495
								
							
						
					
					
						commit
						4f809d0311
					
				@ -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?
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user