From d32be75ec0a3b7d6ecdde5a55a6f305cc541103e Mon Sep 17 00:00:00 2001 From: William Ma Date: Tue, 25 Aug 2020 09:23:27 -0400 Subject: [PATCH] named args: Print correct cask ref when name is resolved as formula/keg --- Library/Homebrew/cli/named_args.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb index 2597f4ba51..b71c7b438e 100644 --- a/Library/Homebrew/cli/named_args.rb +++ b/Library/Homebrew/cli/named_args.rb @@ -29,7 +29,7 @@ module Homebrew downcased_unique_named.each do |name| formulae_and_casks << Formulary.factory(name, spec) - puts "Treating #{name} as a formula. For the cask, use homebrew/cask/#{name}" if cask_exists_with_ref name + warn_if_cask_conflicts(name, "formula") rescue FormulaUnavailableError begin formulae_and_casks << Cask::CaskLoader.load(name) @@ -56,7 +56,7 @@ module Homebrew downcased_unique_named.each do |name| resolved_formulae << Formulary.resolve(name, spec: spec(nil), force_bottle: @force_bottle, flags: @flags) - puts "Treating #{name} as a formula. For the cask, use homebrew/cask/#{name}" if cask_exists_with_ref name + warn_if_cask_conflicts(name, "formula") rescue FormulaUnavailableError begin casks << Cask::CaskLoader.load(name) @@ -98,7 +98,7 @@ module Homebrew downcased_unique_named.each do |name| kegs << resolve_keg(name) - puts "Treating #{name} as a keg. For the cask, use homebrew/cask/#{name}" if cask_exists_with_ref name + warn_if_cask_conflicts(name, "keg") rescue NoSuchKegError, FormulaUnavailableError begin casks << Cask::CaskLoader.load(name) @@ -174,10 +174,12 @@ module Homebrew end end - def cask_exists_with_ref(ref) - Cask::CaskLoader.load ref + def warn_if_cask_conflicts(ref, loaded_type) + cask = Cask::CaskLoader.load ref + + puts "Treating #{ref} as a #{loaded_type}. For the cask, use #{cask.tap.name}/#{cask.token}" rescue Cask::CaskUnavailableError - false + # No ref conflict with a cask, do nothing end end end