diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-09-03 08:17:57 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-09-03 10:50:37 +0300 |
| commit | a68bcb383e6b8601a7e4ab8ae67407e59eee0f95 (patch) | |
| tree | 50ab12d0f4da8f2e94201a554135df88deae52af /lib/verify.c | |
| parent | 61432eb77184d9a2dc6da828a18f6d8f33f95812 (diff) | |
| download | rpm-a68bcb383e6b8601a7e4ab8ae67407e59eee0f95.tar.gz | |
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)
Diffstat (limited to 'lib/verify.c')
| -rw-r--r-- | lib/verify.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/verify.c b/lib/verify.c index 018a0d0a4..7c832d981 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -473,13 +473,12 @@ int rpmcliVerify(rpmts ts, QVA_t qva, char * const * argv) if (qva->qva_showPackage == NULL) qva->qva_showPackage = showVerifyPackage; - /* XXX verify flags are inverted from query. */ vsflags = rpmExpandNumeric("%{?_vsflags_verify}"); - if (!(qva->qva_flags & VERIFY_DIGEST)) + if (rpmcliQueryFlags & VERIFY_DIGEST) vsflags |= _RPMVSF_NODIGESTS; - if (!(qva->qva_flags & VERIFY_SIGNATURE)) + if (rpmcliQueryFlags & VERIFY_SIGNATURE) vsflags |= _RPMVSF_NOSIGNATURES; - if (!(qva->qva_flags & VERIFY_HDRCHK)) + if (rpmcliQueryFlags & VERIFY_HDRCHK) vsflags |= RPMVSF_NOHDRCHK; vsflags &= ~RPMVSF_NEEDPAYLOAD; |