From 867b155479be4a50e02580e05df770aec84438be Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 29 Jan 2019 19:39:41 +0000 Subject: [PATCH] Add missing conflicts to command options. --- Library/Homebrew/cmd/deps.rb | 1 + Library/Homebrew/cmd/desc.rb | 1 + Library/Homebrew/cmd/fetch.rb | 2 ++ Library/Homebrew/cmd/info.rb | 1 + Library/Homebrew/cmd/install.rb | 3 +++ Library/Homebrew/cmd/options.rb | 1 + Library/Homebrew/cmd/outdated.rb | 1 + Library/Homebrew/cmd/reinstall.rb | 1 + Library/Homebrew/cmd/unpack.rb | 1 + Library/Homebrew/cmd/upgrade.rb | 1 + Library/Homebrew/cmd/uses.rb | 1 + Library/Homebrew/dev-cmd/bump-formula-pr.rb | 1 + Library/Homebrew/dev-cmd/create.rb | 1 + Library/Homebrew/dev-cmd/test.rb | 1 + 14 files changed, 17 insertions(+) diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb index b2f038c286..dd51f8913b 100644 --- a/Library/Homebrew/cmd/deps.rb +++ b/Library/Homebrew/cmd/deps.rb @@ -98,6 +98,7 @@ module Homebrew "debugging the `--installed`/`--all` display mode." switch :verbose switch :debug + conflicts "--installed", "--all" end end diff --git a/Library/Homebrew/cmd/desc.rb b/Library/Homebrew/cmd/desc.rb index 2ce5514fc4..5e9c972272 100644 --- a/Library/Homebrew/cmd/desc.rb +++ b/Library/Homebrew/cmd/desc.rb @@ -37,6 +37,7 @@ module Homebrew description: "Search just the descriptions for provided . If is flanked by slashes, "\ "it is interpreted as a regular expression." switch :verbose + conflicts "--search=", "--name=", "--description=" end end diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index 3b870b3640..84a8e2bc24 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -60,6 +60,8 @@ module Homebrew "even if it would not be used during installation." switch :verbose switch :debug + conflicts "--devel", "--HEAD" + conflicts "--build-from-source", "--build-bottle", "--force-bottle" end end diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index ce72549531..3693a6cba9 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -79,6 +79,7 @@ module Homebrew switch :verbose, description: "See more verbose analytics data." switch :debug + conflicts "--all", "--installed" end end diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 46b4820f90..46a4bef490 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -146,6 +146,9 @@ module Homebrew "package into a Homebrew package." switch "-g", "--git", description: "Create a Git repository, useful for creating patches to the software." + conflicts "--ignore-dependencies", "--only-dependencies" + conflicts "--devel", "--HEAD" + conflicts "--build-from-source", "--build-bottle", "--force-bottle" formula_options end end diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb index d113e6ef38..8fa65c3a1a 100644 --- a/Library/Homebrew/cmd/options.rb +++ b/Library/Homebrew/cmd/options.rb @@ -29,6 +29,7 @@ module Homebrew switch "--installed", description: "Show options for all installed formulae." switch :debug + conflicts "--all", "--installed" end end diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index 63afc3666d..6477dc2b8d 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -46,6 +46,7 @@ module Homebrew "formula is outdated. Otherwise, the repository's HEAD will be checked for "\ "updates when a new stable or devel version has been released." switch :debug + conflicts "--quiet", "--verbose", "--json=" end end diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index 0b0abe0a7d..d1d7a0f05c 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -60,6 +60,7 @@ module Homebrew description: "Print the verification and postinstall steps." switch "--display-times", description: "Print install times for each formula at the end of the run." + conflicts "--build-from-source", "--force-bottle" formula_options end end diff --git a/Library/Homebrew/cmd/unpack.rb b/Library/Homebrew/cmd/unpack.rb index a13351f50a..f091df6d78 100644 --- a/Library/Homebrew/cmd/unpack.rb +++ b/Library/Homebrew/cmd/unpack.rb @@ -34,6 +34,7 @@ module Homebrew switch :force switch :verbose switch :debug + conflicts "--git", "--patch" end end diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 798a7e6418..71c6b81e7e 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -81,6 +81,7 @@ module Homebrew description: "Print the verification and postinstall steps." switch "--display-times", description: "Print install times for each formula at the end of the run." + conflicts "--build-from-source", "--force-bottle" formula_options end end diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb index f5d4a73ef1..654211dbad 100644 --- a/Library/Homebrew/cmd/uses.rb +++ b/Library/Homebrew/cmd/uses.rb @@ -59,6 +59,7 @@ module Homebrew switch "--HEAD", description: "Show usage of by HEAD build." switch :debug + conflicts "--devel", "--HEAD" end end diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 95d64c0202..26c077fed1 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -104,6 +104,7 @@ module Homebrew switch :quiet switch :verbose switch :debug + conflicts "--no-audit", "--strict" conflicts "--url", "--tag" end end diff --git a/Library/Homebrew/dev-cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb index 69b3a7e12e..1f219c29b1 100644 --- a/Library/Homebrew/dev-cmd/create.rb +++ b/Library/Homebrew/dev-cmd/create.rb @@ -59,6 +59,7 @@ module Homebrew switch :force switch :verbose switch :debug + conflicts "--autotools", "--cmake", "--meson" end end diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb index 1198bd73d3..cdd4837ec9 100644 --- a/Library/Homebrew/dev-cmd/test.rb +++ b/Library/Homebrew/dev-cmd/test.rb @@ -41,6 +41,7 @@ module Homebrew description: "Keep the temporary files created for the test." switch :verbose switch :debug + conflicts "--devel", "--HEAD" end end