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

Merge pull request #16069 from apainintheneck/handle-name-conflicts-in-to_paths

Browse Source 
cli/named_args: better handle name conflicts in #to_paths
This commit is contained in:
Mike McQuaid 2023-10-02 12:45:12 +01:00 committed by GitHub
commit d2f07f884d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cli/named_args.rb
View File

@ -221,6 +221,10 @@ module Homebrew
to_formulae_to_casks(only: only, method: :resolve) to_formulae_to_casks(only: only, method: :resolve)
end end
LOCAL_PATH_REGEX = %r{^/|[.]|/$}.freeze
TAP_NAME_REGEX = %r{^[^./]+/[^./]+$}.freeze
private_constant :LOCAL_PATH_REGEX, :TAP_NAME_REGEX
# Keep existing paths and try to convert others to tap, formula or cask paths. # Keep existing paths and try to convert others to tap, formula or cask paths.
# If a cask and formula with the same name exist, includes both their paths # If a cask and formula with the same name exist, includes both their paths
# unless `only` is specified. # unless `only` is specified.
@ -230,9 +234,9 @@ module Homebrew
@to_paths[only] ||= Homebrew.with_no_api_env_if_needed(@without_api) do @to_paths[only] ||= Homebrew.with_no_api_env_if_needed(@without_api) do
downcased_unique_named.flat_map do |name| downcased_unique_named.flat_map do |name|
path = Pathname(name).expand_path path = Pathname(name).expand_path
if only.nil? && File.exist?(name) if only.nil? && name.match?(LOCAL_PATH_REGEX) && path.exist?
path path
elsif name.count("/") == 1 && !name.start_with?("./", "/") elsif name.match?(TAP_NAME_REGEX)
tap = Tap.fetch(name) tap = Tap.fetch(name)
if recurse_tap if recurse_tap