SOURCES (rpm-4_4_9): rpm-rpm5-patchset-10061.patch (NEW) - jbj: fi...

[glen]

Author: glen                         Date: Mon Apr  7 18:57:23 2008 GMT
Module: SOURCES                       Tag: rpm-4_4_9
---- Log message:
- jbj: fix: reverse arrows on erasure dependency graph.
  should fix erase+install problems on rpm upgrades

---- Files affected:
SOURCES:
   rpm-rpm5-patchset-10061.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-rpm5-patchset-10061.patch
diff -u /dev/null SOURCES/rpm-rpm5-patchset-10061.patch:1.1.2.1
--- /dev/null	Mon Apr  7 20:57:23 2008
+++ SOURCES/rpm-rpm5-patchset-10061.patch	Mon Apr  7 20:57:18 2008
@@ -0,0 +1,33 @@
+Index: rpm/CHANGES
+ 5.0.0 -> 5.1a1:
++    - jbj: fix: reverse arrows on erasure dependency graph.
+     - rse: provide the necessary pre-processor macros to allow misc/err.h to compile with Sun Studio 12 under Solaris 10
+     - jbj: rpmrepo: be kind to the sqlite3 deprived.
+     - jbj: rpmrepo: cleanly separate SQL representation from execution.
+Index: rpm/lib/depends.c
+RCS File: /v/rpm/cvs/rpm/lib/depends.c,v
+rcsdiff -q -kk '-r1.392' '-r1.393' -u '/v/rpm/cvs/rpm/lib/depends.c,v' 2>/dev/null
+--- lib/depends.c	2008/03/17 09:50:01	1.392
++++ lib/depends.c	2008/03/31 23:00:56	1.393
+@@ -1882,6 +1882,13 @@
+ 	return 0;
+     selected[i] = 1;
+ 
++    /* Erasures are reversed installs. */
++    if (teType == TR_REMOVED) {
++	rpmte r = p;
++	p = q;
++	q = r;
++    }
++
+     /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
+     rpmteTSI(p)->tsi_count++;			/* bump p predecessor count */
+ 
+@@ -1899,6 +1906,7 @@
+     tsi->tsi_next = rpmteTSI(q)->tsi_next;
+     rpmteTSI(q)->tsi_next = tsi;
+     rpmteTSI(q)->tsi_qcnt++;			/* bump q successor count */
++
+     return 0;
+ }
+ /*@=mustmod@*/
================================================================