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

audit: do not allow aliases and renames in formula conflicts

Browse Source
This commit is contained in:
Alexander Bayandin 2021-06-16 22:52:09 +01:00
parent 84e3e0a6b8
commit 1ddb6ef584
No known key found for this signature in database
GPG Key ID: 444BD9CA93262701
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Homebrew/formula_auditor.rb
View File

@ -318,9 +318,24 @@ module Homebrew
conflicting_formula = Formulary.factory(c.name) conflicting_formula = Formulary.factory(c.name)
problem "Formula should not conflict with itself" if formula == conflicting_formula problem "Formula should not conflict with itself" if formula == conflicting_formula
# Use Formula instead of FormulaConflict to be able correctly handle renamed formulae and aliases next unless @core_tap
reverse_conflicts = conflicting_formula.conflicts.map { |rc| Formulary.factory(rc.name) }
if reverse_conflicts.exclude? formula if CoreTap.instance.formula_renames.key?(c.name) || Formula.aliases.include?(c.name)
problem "Formula conflict should be declared using " \
"canonical name (#{conflicting_formula.name}) instead of #{c.name}"
end
rev_conflict_found = false
conflicting_formula.conflicts.each do |rc|
rc_formula = Formulary.factory(rc.name)
if CoreTap.instance.formula_renames.key?(rc.name) || Formula.aliases.include?(rc.name)
problem "Formula #{conflicting_formula.name} conflict should be declared using " \
"canonical name (#{rc_formula.name}) instead of #{rc.name}"
end
rev_conflict_found ||= rc_formula == formula
end
unless rev_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

8
Library/Homebrew/test/dev-cmd/audit_spec.rb
View File

@ -1142,7 +1142,7 @@ module Homebrew
describe "#audit_conflicts" do describe "#audit_conflicts" do
specify "it warns when conflicting with non-existing formula" do specify "it warns when conflicting with non-existing formula" do
fa = formula_auditor "foo", <<~RUBY fa = formula_auditor "foo", <<~RUBY, core_tap: true
class Foo < Formula class Foo < Formula
url "https://brew.sh/foo-1.0.tgz" url "https://brew.sh/foo-1.0.tgz"
@ -1157,7 +1157,7 @@ module Homebrew
end end
specify "it warns when conflicting with itself" do specify "it warns when conflicting with itself" do
fa = formula_auditor "foo", <<~RUBY fa = formula_auditor "foo", <<~RUBY, core_tap: true
class Foo < Formula class Foo < Formula
url "https://brew.sh/foo-1.0.tgz" url "https://brew.sh/foo-1.0.tgz"
@ -1172,13 +1172,13 @@ module Homebrew
end end
specify "it warns when another formula does not have a symmetric conflict" do specify "it warns when another formula does not have a symmetric conflict" do
formula_auditor "bar", <<~RUBY formula_auditor "bar", <<~RUBY, core_tap: true
class Bar < Formula class Bar < Formula
url "https://brew.sh/foo-1.0.tgz" url "https://brew.sh/foo-1.0.tgz"
end end
RUBY RUBY
fa = formula_auditor "foo", <<~RUBY fa = formula_auditor "foo", <<~RUBY, core_tap: true
class Foo < Formula class Foo < Formula
url "https://brew.sh/foo-1.0.tgz" url "https://brew.sh/foo-1.0.tgz"