Fix PR issues
This commit is contained in:
parent
1ae38fb2a4
commit
525d1ac27d
@ -246,12 +246,11 @@ module Homebrew
|
|||||||
require "formula"
|
require "formula"
|
||||||
require "missing_formula"
|
require "missing_formula"
|
||||||
|
|
||||||
raise UsageError if name.empty?
|
raise UsageError if name.blank?
|
||||||
|
|
||||||
rack = Formulary.to_rack(name.downcase)
|
rack = Formulary.to_rack(name.downcase)
|
||||||
|
|
||||||
dirs = rack.directory? ? rack.subdirs : []
|
dirs = rack.directory? ? rack.subdirs : []
|
||||||
|
|
||||||
raise NoSuchKegError, rack.basename if dirs.empty?
|
raise NoSuchKegError, rack.basename if dirs.empty?
|
||||||
|
|
||||||
linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
|
linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
|
||||||
@ -278,7 +277,7 @@ module Homebrew
|
|||||||
Keg.new(prefix)
|
Keg.new(prefix)
|
||||||
end
|
end
|
||||||
rescue FormulaUnavailableError
|
rescue FormulaUnavailableError
|
||||||
raise <<~EOS
|
raise MultipleVersionsInstalledError, <<~EOS
|
||||||
Multiple kegs installed to #{rack}
|
Multiple kegs installed to #{rack}
|
||||||
However we don't know which one you refer to.
|
However we don't know which one you refer to.
|
||||||
Please delete (with rm -rf!) all but one and then try again.
|
Please delete (with rm -rf!) all but one and then try again.
|
||||||
|
@ -75,7 +75,7 @@ module Homebrew
|
|||||||
|
|
||||||
Homebrew.messages.display_messages
|
Homebrew.messages.display_messages
|
||||||
|
|
||||||
return if casks.empty?
|
return if casks.blank?
|
||||||
|
|
||||||
reinstall_cmd = Cask::Cmd::Reinstall.new(casks)
|
reinstall_cmd = Cask::Cmd::Reinstall.new(casks)
|
||||||
reinstall_cmd.verbose = args.verbose?
|
reinstall_cmd.verbose = args.verbose?
|
||||||
|
@ -123,7 +123,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return if casks.empty?
|
return if casks.blank?
|
||||||
|
|
||||||
cask_uninstall = Cask::Cmd::Uninstall.new(casks)
|
cask_uninstall = Cask::Cmd::Uninstall.new(casks)
|
||||||
cask_uninstall.force = args.force?
|
cask_uninstall.force = args.force?
|
||||||
|
Loading…
x
Reference in New Issue
Block a user