diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:50:58 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:50:58 +0200 |
commit | 6b1ce53ae108d6581861237864d74747099d5cb1 (patch) | |
tree | 011be788ddebaaa3c89231ee7cb8ffa6340a2bcf /lib/rpmgi.c | |
parent | 047f4ea669d4565fc579075806cb194266b4d67b (diff) | |
download | rpm-6b1ce53ae108d6581861237864d74747099d5cb1.tar.gz rpm-6b1ce53ae108d6581861237864d74747099d5cb1.tar.bz2 rpm-6b1ce53ae108d6581861237864d74747099d5cb1.zip |
Lose the hidden and useless transaction add/order through rpmgi hackery
Diffstat (limited to 'lib/rpmgi.c')
-rw-r--r-- | lib/rpmgi.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/lib/rpmgi.c b/lib/rpmgi.c index 0a7ab94ed..fdcbdecc2 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.c @@ -584,43 +584,10 @@ 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; @@ -645,11 +612,6 @@ rpmRC rpmgiSetArgs(rpmgi gi, ARGV_const_t argv, int ftsOpts, rpmgiFlags flags) return rpmgiGlobArgv(gi, argv); } -rpmgiFlags rpmgiGetFlags(rpmgi gi) -{ - return (gi != NULL ? gi->flags : RPMGI_NONE); -} - int rpmgiNumErrors(rpmgi gi) { return (gi != NULL ? gi->errors : -1); |