Revert "Add macro _vsflags_query_rpmdb"

This is too flimsy a mechanism for such a critical item as signature
checking: with the innocent- and unrelated looking commit
e3e5db7f396bcdbaf04f87ba3b5c8101ee8f07f5 in place,
'rpm -q foo.rpm' runs with NO signature checking whereas 'rpm -qp foo.rpm'
does signature check. Not sane behavior.

Also the commit is buggy to begin with, qva->qva_source is not a bitfield
so most queries would run with signature checking enabled still.
Revisit some day in a different form, maybe.

This reverts commit b30fca9eedd5c3963699ee5382f0ee1e32fbab7c.

(cherry picked from commit 1d32a881813335c7737be91077bf59c2bc27048b)

2 files changed, 1 insertions, 9 deletions

diff --git a/lib/query.c b/lib/query.c
index d0274d0d3..b15b99b37 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -583,14 +583,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, char * const * argv)
 	qva->qva_queryFormat = fmt;
     }
 
-    if (!(qva->qva_source & RPMQV_RPM) &&
-	rpmExpandNumeric("%{?_vsflags_query_rpmdb:1}")) {
-
-	vsflags = rpmExpandNumeric("%{?_vsflags_query_rpmdb}");
-    } else {
-	vsflags = rpmExpandNumeric("%{?_vsflags_query}");
-    }
-
+    vsflags = rpmExpandNumeric("%{?_vsflags_query}");
     if (rpmcliQueryFlags & VERIFY_DIGEST)
 	vsflags |= _RPMVSF_NODIGESTS;
     if (rpmcliQueryFlags & VERIFY_SIGNATURE)
diff --git a/macros.in b/macros.in
index 935b8e595..fd57f2eba 100644
--- a/macros.in
+++ b/macros.in
@@ -616,7 +616,6 @@ package or when debugging this package.\
 %_vsflags_erase		%{__vsflags}
 %_vsflags_install	%{__vsflags}
 %_vsflags_query		%{__vsflags}
-%_vsflags_query_rpmdb	0xf0f00
 %_vsflags_rebuilddb	0xc0c00
 %_vsflags_verify	%{__vsflags}