Discard ts->addedPackages at end of rpmdepOrder() for now.

CVS patchset: 5172
CVS date: 2001/11/11 03:15:47

diff --git a/lib/depends.c b/lib/depends.c
index 1c2d8f2..7c3d9d4 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1716,6 +1716,19 @@ prtTSI(" p", p->tsi);
     ts->orderAlloced = ts->orderCount;
     orderList = _free(orderList);
 
+    /* Clean up after dependency checks */
+    pi = teInitIterator(ts);
+    while ((p = teNextIterator(pi)) != NULL) {
+       p->this = dsFree(p->this);
+       p->provides = dsFree(p->provides);
+       p->requires = dsFree(p->requires);
+       p->conflicts = dsFree(p->conflicts);
+       p->obsoletes = dsFree(p->obsoletes);
+    }
+    pi = teFreeIterator(pi);
+
+    ts->addedPackages = alFree(ts->addedPackages);
+
     return 0;
 }
 

diff --git a/lib/transaction.c b/lib/transaction.c
index ba20f12..2114913 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1079,6 +1079,7 @@ int keep_header = 0;
     }
     tei = teFreeIterator(tei);
 
+#ifdef DYING
     /* FIXME: it seems a bit silly to read in all of these headers twice */
     /* The ordering doesn't matter here */
     if (ts->numRemovedPackages > 0) {
@@ -1094,6 +1095,25 @@ int keep_header = 0;
        }
        mi = rpmdbFreeIterator(mi);
     }
+#else
+    /* The ordering doesn't matter here */
+    tei = teInitIterator(ts);
+    while ((p = teNext(tei, TR_REMOVED)) != NULL) {
+       rpmFNSet fns;
+
+       fns = p->fns;
+       if (fns == NULL)
+           continue;
+       if (fns->bnl == NULL)
+           continue;   /* XXX can't happen */
+       if (fns->dnl == NULL)
+           continue;   /* XXX can't happen */
+       if (fns->dil == NULL)
+           continue;   /* XXX can't happen */
+       totalFileCount += fns->fc;
+    }
+    tei = teFreeIterator(tei);
+#endif
 
     /* ===============================================
      * Initialize transaction element file info for package:

diff --git a/po/rpm.pot b/po/rpm.pot
index dc96a77..02b8abd 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-10 21:35-0500\n"
+"POT-Creation-Date: 2001-11-10 22:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"