summaryrefslogtreecommitdiff
path: root/lib/verify.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2017-11-14 11:03:04 +0200
committerPanu Matilainen <pmatilai@redhat.com>2017-11-14 11:12:04 +0200
commit80f8d6376066a3e2e303965d7f0e462d0f2bb8bb (patch)
treef1e23b827b2943b33040acf027ba482430001d89 /lib/verify.c
parent3fe0beeb073a8427c4fd124c4e944b8fc27c37c1 (diff)
downloadrpm-80f8d6376066a3e2e303965d7f0e462d0f2bb8bb.tar.gz
Split cli verification flags out of qva_flags
These are common in all cli operation, hiding them in "query flags" under yet another (or actually two, QUERY_DIGEST / VERIFY_DIGEST etc) different names and then translating back to internal vsflags everywhere doesn't make anybody's life easier. No functional changes from cli point of view, any theoretical API users will need changes of course.
Diffstat (limited to 'lib/verify.c')
-rw-r--r--lib/verify.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/verify.c b/lib/verify.c
index 47f0d8efc..75f420986 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -501,12 +501,7 @@ int rpmcliVerify(rpmts ts, QVA_t qva, char * const * argv)
qva->qva_showPackage = showVerifyPackage;
vsflags = rpmExpandNumeric("%{?_vsflags_verify}");
- if (rpmcliQueryFlags & VERIFY_DIGEST)
- vsflags |= _RPMVSF_NODIGESTS;
- if (rpmcliQueryFlags & VERIFY_SIGNATURE)
- vsflags |= _RPMVSF_NOSIGNATURES;
- if (rpmcliQueryFlags & VERIFY_HDRCHK)
- vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
vsflags &= ~RPMVSF_NEEDPAYLOAD;
rpmtsSetScriptFd(ts, scriptFd);