Link: http://rakesh.fedorapeople.org/rpm/0004-Remove-not-used-RPMGI_TSADD-and-RPMGI_TSORDER.patch
--
rakesh
>From 4f313b4a96451692a4e9defec8335264fae8b4ed Mon Sep 17 00:00:00 2001
From: Rakesh Pandit <rakesh at fedoraproject.org>
Date: Fri, 24 Apr 2009 04:19:02 +0530
Subject: [PATCH] Remove not used RPMGI_TSADD and RPMGI_TSORDER.
---
lib/poptQV.c | 4 ++--
lib/query.c | 3 ---
lib/rpmgi.c | 32 --------------------------------
lib/rpmgi.h | 8 +++-----
4 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 09e2d3f..ef411f8 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -130,9 +130,9 @@ struct poptOption rpmQVSourcePoptTable[] = {
{ "whatprovides", '\0', 0, 0, POPT_WHATPROVIDES,
N_("query/verify the package(s) which provide a dependency"), "CAPABILITY" },
- { "transaction", 'T', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&giFlags, (RPMGI_TSADD|RPMGI_TSORDER),
+ { "transaction", 'T', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, 0,
N_("create transaction set"), NULL},
- { "noorder", '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, &giFlags,
RPMGI_TSORDER,
+ { "noorder", '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, 0,
N_("do not order transaction set"), NULL},
{ "noglob", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &giFlags,
RPMGI_NOGLOB,
N_("do not glob arguments"), NULL},
diff --git a/lib/query.c b/lib/query.c
index a11d29c..921b081 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -566,9 +566,6 @@ static int rpmcliArgIterHelper(rpmts ts, QVA_t
qva, rpmTag tag, ARGV_const_t arg
qva->qva_gi = rpmgiNew(ts, tag, NULL, 0);
qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, gFlgs);
- if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) &
RPMGI_TSADD)) /* Load the ts with headers. */
- while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK)
- {};
if (rpmrc != RPMRC_NOTFOUND) {
qva->qva_gi = rpmgiFree(qva->qva_gi);
return 1; /* XXX should be no. of failures. */
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 9719cdd..9eff7a6 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -597,43 +597,11 @@ fprintf(stderr, "*** gi %p\t%p[%d]: %s\n", gi,
gi->argv, gi->i, gi->argv[gi->i])
break;
}
- if ((gi->flags & RPMGI_TSADD) && gi->h != NULL) {
- /* XXX rpmgi hack: Save header in transaction element. */
- xx = rpmtsAddInstallElement(gi->ts, gi->h, (fnpyKey)gi->hdrPath, 2, NULL);
- }
return rpmrc;
enditer:
gi->mi = rpmdbFreeIterator(gi->mi);
- if (gi->flags & RPMGI_TSORDER) {
- rpmts ts = gi->ts;
- rpmps ps;
-
- /* XXX installed database needs close here. */
- xx = rpmtsCloseDB(ts);
- xx = rpmtsSetDBMode(ts, -1); /* XXX disable lazy opens */
-
- xx = rpmtsCheck(ts);
-
- /* XXX query/verify will need the glop added to a buffer instead. */
- ps = rpmtsProblems(ts);
- if (rpmpsNumProblems(ps) > 0) {
- /* XXX rpminstall will need RPMLOG_ERR */
- rpmlog(RPMLOG_INFO, _("Failed dependencies:\n"));
- if (rpmIsVerbose())
- rpmpsPrint(NULL, ps);
- }
- ps = rpmpsFree(ps);
- rpmtsCleanProblems(ts);
-
- xx = rpmtsOrder(ts);
-
- gi->tag = RPMDBI_ADDED; /* XXX hackery */
- gi->flags &= ~(RPMGI_TSADD|RPMGI_TSORDER);
-
- }
-
gi->h = headerFree(gi->h);
gi->hdrPath = _free(gi->hdrPath);
gi->i = -1;
diff --git a/lib/rpmgi.h b/lib/rpmgi.h
index 8dfc6f2..408e907 100644
--- a/lib/rpmgi.h
+++ b/lib/rpmgi.h
@@ -20,11 +20,9 @@ extern int _rpmgi_debug;
*/
typedef enum rpmgiFlags_e {
RPMGI_NONE = 0,
- RPMGI_TSADD = (1 << 0),
- RPMGI_TSORDER = (1 << 1),
- RPMGI_NOGLOB = (1 << 2),
- RPMGI_NOMANIFEST = (1 << 3),
- RPMGI_NOHEADER = (1 << 4)
+ RPMGI_NOGLOB = (1 << 0),
+ RPMGI_NOMANIFEST = (1 << 1),
+ RPMGI_NOHEADER = (1 << 2)
} rpmgiFlags;
/** \ingroup rpmgi
--
1.6.0.6