rpms/rpm/devel rpm-4.4.2-transaction-order.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3355

Modified Files:
	rpm-4.4.2-transaction-order.patch 
Log Message:
Updated ordering patch for removals/upgrades


rpm-4.4.2-transaction-order.patch:
 depends.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: rpm-4.4.2-transaction-order.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-transaction-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-transaction-order.patch	31 Oct 2006 09:33:53 -0000	1.1
+++ rpm-4.4.2-transaction-order.patch	20 Nov 2006 11:27:59 -0000	1.2
@@ -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;