diff options
| author | Nigel Kukard <nkukard@lbsd.net> | 2009-12-25 10:29:22 +0000 |
|---|---|---|
| committer | Nigel Kukard <nkukard@lbsd.net> | 2009-12-25 10:29:22 +0000 |
| commit | f16a9799b65214ffe1b07372676386e31ad51801 (patch) | |
| tree | 623250fb62f9e58c5f1f7306965c944e6870172e /package/rpm/rpm-5.2.0_ordering-fix.patch | |
| parent | 9400c73582326c543fae82120af3904836145655 (diff) | |
| download | buildroot-novena-f16a9799b65214ffe1b07372676386e31ad51801.tar.gz buildroot-novena-f16a9799b65214ffe1b07372676386e31ad51801.zip | |
Bumped rpm
Diffstat (limited to 'package/rpm/rpm-5.2.0_ordering-fix.patch')
| -rw-r--r-- | package/rpm/rpm-5.2.0_ordering-fix.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/package/rpm/rpm-5.2.0_ordering-fix.patch b/package/rpm/rpm-5.2.0_ordering-fix.patch new file mode 100644 index 000000000..a618e1f2c --- /dev/null +++ b/package/rpm/rpm-5.2.0_ordering-fix.patch @@ -0,0 +1,45 @@ +Included upstream +--- x/lib/depends.c 2009/05/15 13:40:58 1.445 ++++ y/lib/depends.c 2009/08/22 22:12:02 1.446 +@@ -2216,9 +2216,6 @@ + { + rpmte q, qprev; + +- /* Mark the package as queued. */ +- rpmteTSI(p)->tsi_queued = 1; +- + if ((*rp) == NULL) { /* 1st element */ + /*@-dependenttrans@*/ /* FIX: double indirection */ + (*rp) = (*qp) = p; +@@ -2238,6 +2235,12 @@ + /* XXX Insure removed after added. */ + if (rpmteType(p) == TR_REMOVED && rpmteType(p) != rpmteType(q)) + continue; ++ ++ /* XXX Follow all previous generations in the queue. */ ++ if (rpmteTSI(p)->tsi_queued > rpmteTSI(q)->tsi_queued) ++ continue; ++ ++ /* XXX Within a generation, queue behind more "important". */ + if (rpmteTSI(q)->tsi_qcnt <= rpmteTSI(p)->tsi_qcnt) + break; + } +@@ -2521,6 +2524,9 @@ + + if (rpmteTSI(p)->tsi_count != 0) + continue; ++ ++ /* Mark the package as queued. */ ++ rpmteTSI(p)->tsi_queued = orderingCount + 1; + rpmteTSI(p)->tsi_suc = NULL; + addQ(p, &q, &r, prefcolor); + qlen++; +@@ -2584,6 +2590,8 @@ + (void) rpmteSetParent(p, q); + (void) rpmteSetDegree(q, rpmteDegree(q)+1); + ++ /* Mark the package as queued. */ ++ rpmteTSI(p)->tsi_queued = orderingCount + 1; + /* XXX TODO: add control bit. */ + rpmteTSI(p)->tsi_suc = NULL; + /*@-nullstate@*/ /* XXX FIX: rpmteTSI(q)->tsi_suc can be NULL. */ |