From 525d1ac27da028d47c4a7aa41d88c70f18515a4f Mon Sep 17 00:00:00 2001 From: William Ma Date: Fri, 3 Jul 2020 10:33:38 -0400 Subject: [PATCH] Fix PR issues --- Library/Homebrew/cli/args.rb | 5 ++--- Library/Homebrew/cmd/reinstall.rb | 2 +- Library/Homebrew/cmd/uninstall.rb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb index 7f76690df7..927703327d 100644 --- a/Library/Homebrew/cli/args.rb +++ b/Library/Homebrew/cli/args.rb @@ -246,12 +246,11 @@ module Homebrew require "formula" require "missing_formula" - raise UsageError if name.empty? + raise UsageError if name.blank? rack = Formulary.to_rack(name.downcase) dirs = rack.directory? ? rack.subdirs : [] - raise NoSuchKegError, rack.basename if dirs.empty? linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename @@ -278,7 +277,7 @@ module Homebrew Keg.new(prefix) end rescue FormulaUnavailableError - raise <<~EOS + raise MultipleVersionsInstalledError, <<~EOS Multiple kegs installed to #{rack} However we don't know which one you refer to. Please delete (with rm -rf!) all but one and then try again. diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index d5e4a972ae..037260a2ea 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -75,7 +75,7 @@ module Homebrew Homebrew.messages.display_messages - return if casks.empty? + return if casks.blank? reinstall_cmd = Cask::Cmd::Reinstall.new(casks) reinstall_cmd.verbose = args.verbose? diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index ad5f823dbf..2cb101b296 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -123,7 +123,7 @@ module Homebrew end end - return if casks.empty? + return if casks.blank? cask_uninstall = Cask::Cmd::Uninstall.new(casks) cask_uninstall.force = args.force?