From a68bcb383e6b8601a7e4ab8ae67407e59eee0f95 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 3 Sep 2010 08:17:57 +0300 Subject: Use the common rpmcliQueryFlags for signature verify options in rpm cli too - Technically this changes the rpmcliQuery() and rpmcliVerify() API in the sense that we no longer honor the qva->qva_flags for the --nosignature and others, but we assume anybody using these (as if anybody was using the "cli" API) uses rpmcliInit() which takes care of these common bits... shrug. - Ditch ancient and hidden --nopgp --nogpg switches along with the dishwater which are simply alias to --nosignature. - Eliminate now unused qva_flags from rpmInstallArguments (along with a double vsflags goo from rpmgraph) --- rpmqv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpmqv.c') diff --git a/rpmqv.c b/rpmqv.c index 324116265..979a4ee1a 100644 --- a/rpmqv.c +++ b/rpmqv.c @@ -486,7 +486,7 @@ int main(int argc, char *argv[]) { rpmVerifyFlags verifyFlags = (VERIFY_FILEDIGEST|VERIFY_DIGEST|VERIFY_SIGNATURE); - verifyFlags &= ~ka->qva_flags; + verifyFlags &= ~rpmcliQueryFlags; ka->qva_flags = (rpmQueryFlags) verifyFlags; } case MODE_RESIGN: -- cgit v1.2.3