- simplify specfile query linkage loop.

- drill rpmts into parseSpec(), carrying Spec along.

CVS patchset: 5958
CVS date: 2002/12/22 02:11:05

1 files changed, 4 insertions, 6 deletions

diff --git a/rpmqv.c b/rpmqv.c
index 608ca3d0e..ae2afa2f1 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -263,12 +263,6 @@ int main(int argc, const char ** argv)
     default:
 	break;
     }
-
-    /* XXX Eliminate query linkage loop */
-    /*@-type@*/	/* FIX: casts? */
-    parseSpecVec = parseSpec;
-    freeSpecVec = freeSpec;
-    /*@=type@*/
 #endif
 
 #if defined(ENABLE_NLS)
@@ -795,7 +789,11 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
     case MODE_QUERY:
 	if (qva->qva_source != RPMQV_ALL && !poptPeekArg(optCon))
 	    argerror(_("no arguments given for query"));
+
+	qva->qva_specQuery = rpmspecQuery;
 	ec = rpmcliQuery(ts, qva, (const char **) poptGetArgs(optCon));
+	qva->qva_specQuery = NULL;
+
 	/* XXX don't overflow single byte exit status */
 	if (ec > 255) ec = 255;
 	break;