diff options
| author | Jack Nagel | 2013-06-09 13:44:59 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-06-09 13:45:25 -0500 |
| commit | 8b9a3a560f93b1a1f42dcae83240ffddb6763be0 (patch) | |
| tree | 1f2bbd62743b91234a46fc091b7fc0d88027a7b8 /Library/Homebrew/cmd | |
| parent | 33cae6ac42a480c39b9510ac4d65a3c5b6c08797 (diff) | |
| download | brew-8b9a3a560f93b1a1f42dcae83240ffddb6763be0.tar.bz2 | |
Separate formula conflicts from requirements
Closes Homebrew/homebrew#20357.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/audit.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/info.rb | 2 |
2 files changed, 4 insertions, 4 deletions
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? |
