tools/pkgconf/patches/0001-cli-remove-version-to-modversion-remapping.patch

   1 From 62bbd3b664d4b03011a4b382ed20353a91c30406 Mon Sep 17 00:00:00 2001
   2 From: Ariadne Conill <ariadne@dereferenced.org>
   3 Date: Tue, 21 Jan 2020 10:32:36 -0600
   4 Subject: [PATCH] cli: remove --version to --modversion remapping
   5
   6 This has been a source of frequent complaints, so we drop it.
   7 Resolves: https://todo.sr.ht/~kaniini/pkgconf/6
   8 ---
   9  cli/main.c | 14 ++------------
  10  1 file changed, 2 insertions(+), 12 deletions(-)
  11
  12 diff --git a/cli/main.c b/cli/main.c
  13 index 563ec8f0cfcd..fc698a4f9191 100644
  14 --- a/cli/main.c
  15 +++ b/cli/main.c
  16 @@ -1005,18 +1005,8 @@ main(int argc, char *argv[])
  17
  18         if ((want_flags & PKG_VERSION) == PKG_VERSION)
  19         {
  20 -               if (argc > 2)
  21 -               {
  22 -                       fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]);
  23 -
  24 -                       want_flags &= ~PKG_VERSION;
  25 -                       want_flags |= PKG_MODVERSION;
  26 -               }
  27 -               else
  28 -               {
  29 -                       version();
  30 -                       return EXIT_SUCCESS;
  31 -               }
  32 +               version();
  33 +               return EXIT_SUCCESS;
  34         }
  35
  36         if ((want_flags & PKG_HELP) == PKG_HELP)