teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.4.2.3-no-order-rescan-limit.patch

Panu Matilainen 7f2427
diff -up rpm-4.4.2.3-rc1/lib/depends.c.no-limit rpm-4.4.2.3-rc1/lib/depends.c
Panu Matilainen 7f2427
--- rpm-4.4.2.3-rc1/lib/depends.c.no-limit	2008-03-12 08:40:08.000000000 +0200
Panu Matilainen 7f2427
+++ rpm-4.4.2.3-rc1/lib/depends.c	2008-03-12 08:58:15.000000000 +0200
Panu Matilainen 7f2427
@@ -1229,7 +1229,7 @@ int rpmtsOrder(rpmts ts)
Panu Matilainen 7f2427
     int numOrderList;
Panu Matilainen 7f2427
     int npeer = 128;	/* XXX more than deep enough for now. */
Panu Matilainen 7f2427
     int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer)));
Panu Matilainen 7f2427
-    int nrescans = 10;
Panu Matilainen 7f2427
+    int nrescans = 0;
Panu Matilainen 7f2427
     int _printed = 0;
Panu Matilainen 7f2427
     char deptypechar;
Panu Matilainen 7f2427
     size_t tsbytes;
Panu Matilainen 7f2427
@@ -1563,8 +1563,10 @@ rescan:
Panu Matilainen 7f2427
 
Panu Matilainen 7f2427
 	/* If a relation was eliminated, then continue sorting. */
Panu Matilainen 7f2427
 	/* XXX TODO: add control bit. */
Panu Matilainen 7f2427
-	if (nzaps && nrescans-- > 0) {
Panu Matilainen 7f2427
-	    rpmMessage(RPMMESS_DEBUG, _("========== continuing tsort ...\n"));
Panu Matilainen 7f2427
+	if (nzaps > 0) {
Panu Matilainen 7f2427
+	    rpmMessage(RPMMESS_DEBUG, 
Panu Matilainen 7f2427
+		       _("========== continuing tsort ... (rescan %d)\n"),
Panu Matilainen 7f2427
+		       ++nrescans);
Panu Matilainen 7f2427
 	    goto rescan;
Panu Matilainen 7f2427
 	}
Panu Matilainen 7f2427