folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Honor --nofiledigest on install too (RhBug:508021) 

- query and install options clash, use popt callback to enable processing
This commit is contained in:
Panu Matilainen 2009-07-14 13:56:27 +03:00
parent 16be29746c
commit 7baf3235d2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/poptQV.c
View File

@ -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 },