aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2016-08-19 15:11:33 +0100
committerGitHub2016-08-19 15:11:33 +0100
commit105d7aa5346553408281ca8f7c4eeb02ea8a7c3f (patch)
tree55ef984cd9de3bdb0c0ab0578453b4cb98d541ec /Library/Homebrew
parent7ccd9453e0972ed164b8c06bde41fcffecd41f08 (diff)
parentff8d22f3b365307e88b7c0bdf16ae6e6d241d9bd (diff)
downloadbrew-105d7aa5346553408281ca8f7c4eeb02ea8a7c3f.tar.bz2
Merge pull request #752 from MikeMcQuaid/diagnostic-ignore-duplicate-brew-cask
diagnostic: ignore duplicated `brew-cask` commands
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/diagnostic.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index a0c6dcd21..1b6fb4568 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -1090,6 +1090,8 @@ module Homebrew
cmd_map[cmd_name] << cmd
end
cmd_map.reject! { |_cmd_name, cmd_paths| cmd_paths.size == 1 }
+ # TODO: remove when Cask migration is complete.
+ cmd_map.reject! { |cmd_name, _cmd_paths| cmd_name.include? "brew-cask" }
return if cmd_map.empty?
message = "You have external commands with conflicting names.\n"