mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

audit_conflicts: verbose variables name

Browse Source
This commit is contained in:
Alexander Bayandin 2021-06-18 16:57:53 +01:00
parent 43d67816ea
commit c95c2e3258
No known key found for this signature in database
GPG Key ID: 444BD9CA93262701
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Library/Homebrew/formula_auditor.rb
View File

@ -315,37 +315,37 @@ module Homebrew
def audit_conflicts def audit_conflicts
tap = formula.tap tap = formula.tap
formula.conflicts.each do |c| formula.conflicts.each do |conflict|
conflicting_formula = Formulary.factory(c.name) conflicting_formula = Formulary.factory(conflict.name)
next if tap != conflicting_formula.tap next if tap != conflicting_formula.tap
problem "Formula should not conflict with itself" if formula == conflicting_formula 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 " \ 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 end
rev_conflict_found = false reverse_conflict_found = false
conflicting_formula.conflicts.each do |rc| conflicting_formula.conflicts.each do |reverse_conflict|
rc_formula = Formulary.factory(rc.name) reverse_conflict_formula = Formulary.factory(reverse_conflict.name)
if tap.formula_renames.key?(rc.name) || tap.aliases.include?(rc.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 " \ 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 end
rev_conflict_found ||= rc_formula == formula reverse_conflict_found ||= reverse_conflict_formula == formula
end end
unless rev_conflict_found unless reverse_conflict_found
problem "Formula #{conflicting_formula.name} should also have a conflict declared with #{formula.name}" problem "Formula #{conflicting_formula.name} should also have a conflict declared with #{formula.name}"
end end
rescue TapFormulaUnavailableError rescue TapFormulaUnavailableError
# Don't complain about missing cross-tap conflicts. # Don't complain about missing cross-tap conflicts.
next next
rescue FormulaUnavailableError rescue FormulaUnavailableError
problem "Can't find conflicting formula #{c.name.inspect}." problem "Can't find conflicting formula #{conflict.name.inspect}."
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
problem "Ambiguous conflicting formula #{c.name.inspect}." problem "Ambiguous conflicting formula #{conflict.name.inspect}."
end end
end end