From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 19 Mar 2009 14:07:18 +0000 (+0200)
Subject: Show query/verify selection options just once in --help
X-Git-Tag: rpm-4.7.0-rc1~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd6f4f039ffefe25ae32d0493499288adc51f33b;p=platform%2Fupstream%2Frpm.git

Show query/verify selection options just once in --help
(cherry picked from commit 2e672f3fae9d8ff7ee64ae13cfa2fe65272c2ede)
---

diff --git a/lib/poptQV.c b/lib/poptQV.c
index b0f8322..09e2d3f 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -233,8 +233,6 @@ struct poptOption rpmQueryPoptTable[] = {
 /* FIX: cast? */
  { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, 
 	queryArgCallback, 0, NULL, NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
-	NULL, NULL },
  { "configfiles", 'c', 0, 0, 'c',
 	N_("list all configuration files"), NULL },
  { "docfiles", 'd', 0, 0, 'd',
@@ -267,8 +265,6 @@ struct poptOption rpmVerifyPoptTable[] = {
 /* FIX: cast? */
  { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, 
 	queryArgCallback, 0, NULL, NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
-	NULL, NULL },
 
  /* Duplicate file verify flags from packages into command line options. */
 /** @todo Add --nomd5 alias to rpmpopt, eliminate. */
diff --git a/rpmqv.c b/rpmqv.c
index 0e15671..bff3184 100644
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -73,17 +73,15 @@ static int quiet;
 static struct poptOption optionsTable[] = {
 
 #ifdef	IAM_RPMQV
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
+        N_("Query/Verify package selection options:"),
+        NULL },
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQueryPoptTable, 0,
 	N_("Query options (with -q or --query):"),
 	NULL },
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmVerifyPoptTable, 0,
 	N_("Verify options (with -V or --verify):"),
 	NULL },
-#ifdef	NOTYET
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliQVSourcePoptTable, 0,
-        N_("Source options (with --query or --verify):"),
-        NULL },
-#endif
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliFtsPoptTable, 0,
         N_("File tree walk options (with --ftswalk):"),
         NULL },