From 78638926332cb7ced3078efc51bb7c7422fac053 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Mon, 20 Nov 2006 11:27:59 +0000 Subject: [PATCH] Updated ordering patch for removals/upgrades --- rpm-4.4.2-transaction-order.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rpm-4.4.2-transaction-order.patch b/rpm-4.4.2-transaction-order.patch index 0a763fe..0a5eeda 100644 --- a/rpm-4.4.2-transaction-order.patch +++ b/rpm-4.4.2-transaction-order.patch @@ -1,5 +1,5 @@ ---- rpm-4.4.2/lib/depends.c.order 2006-10-25 10:24:39.000000000 +0100 -+++ rpm-4.4.2/lib/depends.c 2006-10-25 10:28:07.000000000 +0100 +--- rpm-4.4.2/lib/depends.c.order 2006-11-20 11:17:13.000000000 +0000 ++++ rpm-4.4.2/lib/depends.c 2006-11-20 11:19:19.000000000 +0000 @@ -1421,7 +1421,14 @@ (void) rpmteSetDegree(q, 0); tsbytes += rpmtePkgFileSize(q); @@ -16,3 +16,12 @@ orderingCount++; qlen--; loopcheck--; +@@ -1618,7 +1625,7 @@ + continue; + + j = needle->orIndex; +- if ((q = ts->order[j]) == NULL) ++ if ((q = ts->order[j]) == NULL || needle->pkgKey == RPMAL_NOMATCH) + continue; + + newOrder[newOrderCount++] = q;