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

Merge pull request #13714 from carlocab/dependent-conflict-allowlist

Browse Source 
formula_auditor: create a versioned formula dependent conflict allowlist
This commit is contained in:
Carlo Cabrera 2022-08-19 17:02:43 +08:00 committed by GitHub
commit d4e6925cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_auditor.rb
View File

@ -344,6 +344,10 @@ module Homebrew
recursive_runtime_formulae.each do |f| recursive_runtime_formulae.each do |f|
name = f.name name = f.name
unversioned_name, = name.split("@") unversioned_name, = name.split("@")
# Allow use of the full versioned name (e.g. `python@3.99`) or an unversioned alias (`python`).
next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, name
next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, unversioned_name
version_hash[unversioned_name] ||= Set.new version_hash[unversioned_name] ||= Set.new
version_hash[unversioned_name] << name version_hash[unversioned_name] << name
next if version_hash[unversioned_name].length < 2 next if version_hash[unversioned_name].length < 2

9
Library/Homebrew/tap_auditor.rb
View File

@ -8,8 +8,8 @@ module Homebrew
class TapAuditor class TapAuditor
extend T::Sig extend T::Sig
attr_reader :name, :path, :formula_names, :cask_tokens, :tap_audit_exceptions, :tap_style_exceptions, attr_reader :name, :path, :formula_names, :formula_aliases, :cask_tokens,
:tap_pypi_formula_mappings, :problems :tap_audit_exceptions, :tap_style_exceptions, :tap_pypi_formula_mappings, :problems
sig { params(tap: Tap, strict: T.nilable(T::Boolean)).void } sig { params(tap: Tap, strict: T.nilable(T::Boolean)).void }
def initialize(tap, strict:) def initialize(tap, strict:)
@ -21,6 +21,7 @@ module Homebrew
@tap_pypi_formula_mappings = tap.pypi_formula_mappings @tap_pypi_formula_mappings = tap.pypi_formula_mappings
@problems = [] @problems = []
@formula_aliases = tap.aliases
@formula_names = tap.formula_names.map do |formula_name| @formula_names = tap.formula_names.map do |formula_name|
formula_name.split("/").last formula_name.split("/").last
end end
@ -68,7 +69,9 @@ module Homebrew
list = list.keys if list.is_a? Hash list = list.keys if list.is_a? Hash
invalid_formulae_casks = list.select do |formula_or_cask_name| invalid_formulae_casks = list.select do |formula_or_cask_name|
@formula_names.exclude?(formula_or_cask_name) && @cask_tokens.exclude?("#{@name}/#{formula_or_cask_name}") formula_names.exclude?(formula_or_cask_name) &&
formula_aliases.exclude?(formula_or_cask_name) &&
cask_tokens.exclude?("#{@name}/#{formula_or_cask_name}")
end end
return if invalid_formulae_casks.empty? return if invalid_formulae_casks.empty?