This change alone is likely sufficient to justify releasing rpm-5.1.7.
There are these other fixes pending soonishly too:
1) SELinux is still not right.
2) CLI perl iteration segfaults
3) %exclude needs to be filtered again, broken by the otherwise
sensible changes that Alexey did for orphan subdirs and symlinks
in checkfiles.
4) perl-requires spewage needs to be validated with rpmdeps --perl
73 de Jeff
On Oct 26, 2008, at 2:42 PM, Jeff Johnson wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
>
> ____________________________________________________________________________
>
> Server: rpm5.org Name: Jeff Johnson
> Root: /v/rpm/cvs Email: jbj@rpm5.org
> Module: rpm Date: 26-Oct-2008 19:42:51
> Branch: rpm-5_1 Handle: 2008102618425100
>
> Modified files: (Branch: rpm-5_1)
> rpm CHANGES
> rpm/lib depends.c
>
> Log:
> - add a relation to to force install-before-erase.
> - display dependency loops as an error for now.
>
> Summary:
> Revision Changes Path
> 1.2288.2.142+2 -0 rpm/CHANGES
> 1.394.2.12 +19 -1 rpm/lib/depends.c
>
> ____________________________________________________________________________
>
> patch -p0 <<'@@ .'
> Index: rpm/CHANGES
>
> =
> =
> =
> =
> =
> =
> ======================================================================
> $ cvs diff -u -r1.2288.2.141 -r1.2288.2.142 CHANGES
> --- rpm/CHANGES 18 Oct 2008 08:04:12 -0000 1.2288.2.141
> +++ rpm/CHANGES 26 Oct 2008 18:42:51 -0000 1.2288.2.142
> @@ -1,4 +1,6 @@
> 5.1.6 -> 5.1.7:
> + - jbj: add a relation to to force install-before-erase.
> + - jbj: display dependency loops as an error for now.
>
> 5.1.5 -> 5.1.6:
> - jbj: verify trigger tests have same result as HEAD.
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/lib/depends.c
>
> =
> =
> =
> =
> =
> =
> ======================================================================
> $ cvs diff -u -r1.394.2.11 -r1.394.2.12 depends.c
> --- rpm/lib/depends.c 4 Oct 2008 18:13:43 -0000 1.394.2.11
> +++ rpm/lib/depends.c 26 Oct 2008 18:42:51 -0000 1.394.2.12
> @@ -2385,6 +2385,24 @@
> }
> }
>
> + /* Ensure that erasures follow installs during upgrades. */
> + if (rpmteType(p) == TR_REMOVED && p->flink.Pkgid && p-
> >flink.Pkgid[0]) {
> +
> + qi = rpmtsiInit(ts);
> + while ((q = rpmtsiNext(qi, TR_ADDED)) != NULL) {
> + if (strcmp(q->pkgid, p->flink.Pkgid[0]))
> + continue;
> + requires = rpmdsFromPRCO(q->PRCO, RPMTAG_NAME);
> + if (requires != NULL) {
> + /* XXX disable erased arrow reversal. */
> + p->type = TR_ADDED;
> + (void) addRelation(ts, p, selected, requires);
> + p->type = TR_REMOVED;
> + }
> + }
> + qi = rpmtsiFree(qi);
> + }
> +
> if (_autobits != 0xffffffff)
> {
>
> @@ -2597,7 +2615,7 @@
> #endif
> const char * dp;
> int msglvl = (anaconda || (rpmtsDFlags(ts) &
> RPMDEPS_FLAG_DEPLOOPS))
> - ? RPMLOG_WARNING : RPMLOG_DEBUG;
> + ? RPMLOG_WARNING : RPMLOG_ERR;
> ;
>
> /* Unchain predecessor loop. */
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-cvs@rpm5.org
Received on Sun Oct 26 19:47:02 2008