diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 1bb9c55339..535c61cd81 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -315,37 +315,37 @@ module Homebrew def audit_conflicts tap = formula.tap - formula.conflicts.each do |c| - conflicting_formula = Formulary.factory(c.name) + formula.conflicts.each do |conflict| + conflicting_formula = Formulary.factory(conflict.name) next if tap != conflicting_formula.tap problem "Formula should not conflict with itself" if formula == conflicting_formula - if tap.formula_renames.key?(c.name) || tap.aliases.include?(c.name) + if tap.formula_renames.key?(conflict.name) || tap.aliases.include?(conflict.name) problem "Formula conflict should be declared using " \ - "canonical name (#{conflicting_formula.name}) instead of #{c.name}" + "canonical name (#{conflicting_formula.name}) instead of #{conflict.name}" end - rev_conflict_found = false - conflicting_formula.conflicts.each do |rc| - rc_formula = Formulary.factory(rc.name) - if tap.formula_renames.key?(rc.name) || tap.aliases.include?(rc.name) + reverse_conflict_found = false + conflicting_formula.conflicts.each do |reverse_conflict| + reverse_conflict_formula = Formulary.factory(reverse_conflict.name) + if tap.formula_renames.key?(reverse_conflict.name) || tap.aliases.include?(reverse_conflict.name) problem "Formula #{conflicting_formula.name} conflict should be declared using " \ - "canonical name (#{rc_formula.name}) instead of #{rc.name}" + "canonical name (#{reverse_conflict_formula.name}) instead of #{reverse_conflict.name}" end - rev_conflict_found ||= rc_formula == formula + reverse_conflict_found ||= reverse_conflict_formula == formula end - unless rev_conflict_found + unless reverse_conflict_found problem "Formula #{conflicting_formula.name} should also have a conflict declared with #{formula.name}" end rescue TapFormulaUnavailableError # Don't complain about missing cross-tap conflicts. next rescue FormulaUnavailableError - problem "Can't find conflicting formula #{c.name.inspect}." + problem "Can't find conflicting formula #{conflict.name.inspect}." rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError - problem "Ambiguous conflicting formula #{c.name.inspect}." + problem "Ambiguous conflicting formula #{conflict.name.inspect}." end end