diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-07-14 13:56:27 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-07-21 09:52:21 +0300 |
| commit | 152ec4648d3a3a91b81639b72bdd712f00424685 (patch) | |
| tree | cfc83ab98ea0f224eac1dcb221daa5c81b3c405d | |
| parent | 280f8b009b0d6240298ea552e7004ccbc50b23f4 (diff) | |
| download | rpm-152ec4648d3a3a91b81639b72bdd712f00424685.tar.gz | |
Honor --nofiledigest on install too (RhBug:508021)
- query and install options clash, use popt callback to enable processing
(cherry picked from commit 7baf3235d2263d456fd11b6fa3ad605d0d1d1136)
| -rw-r--r-- | lib/poptQV.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/poptQV.c b/lib/poptQV.c index 09e2d3f49..548c64a48 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -266,12 +266,10 @@ struct poptOption rpmVerifyPoptTable[] = { { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, queryArgCallback, 0, NULL, NULL }, - /* Duplicate file verify flags from packages into command line options. */ -/** @todo Add --nomd5 alias to rpmpopt, eliminate. */ - { "nofiledigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILEDIGEST, + { "nofiledigest", '\0', 0, NULL, RPMCLI_POPT_NOFILEDIGEST, + N_("don't verify digest of files"), NULL }, + { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOFILEDIGEST, N_("don't verify digest of files"), NULL }, - { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILEDIGEST, - N_("don't verify digest of files (obsolete)"), NULL }, { "nosize", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.qva_flags, VERIFY_SIZE, N_("don't verify size of files"), NULL }, |