Merge pull request #9165 from MikeMcQuaid/named_args_tap

cli/named_args: don't convert to taps.
This commit is contained in:
Markus Reiter 2020-11-18 02:48:52 +01:00 committed by GitHub
commit a81edc3940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,14 +100,12 @@ module Homebrew
to_formulae_to_casks(method: :resolve, only: only) to_formulae_to_casks(method: :resolve, only: only)
end end
# Convert named arguments to {Tap}, {Formula} or {Cask} objects. # Convert named arguments to {Formula} or {Cask} objects.
# If both a formula and cask exist with the same name, returns the # If both a formula and cask exist with the same name, returns the
# formula and prints a warning unless `only` is specified. # formula and prints a warning unless `only` is specified.
def to_objects(only: nil, method: nil) def to_objects(only: nil, method: nil)
@to_objects ||= {} @to_objects ||= {}
@to_objects[only] ||= downcased_unique_named.flat_map do |name| @to_objects[only] ||= downcased_unique_named.flat_map do |name|
next Tap.fetch(name) if only == :tap || (only.nil? && name.count("/") == 1 && !name.start_with?("./", "/"))
load_formula_or_cask(name, only: only, method: method) load_formula_or_cask(name, only: only, method: method)
end.uniq.freeze end.uniq.freeze
end end