]>
Commit | Line | Data |
---|---|---|
a3809792 JR |
1 | 4.4.9 -> 4.5: |
2 | + - jbj: add a relation to to force install-before-erase. | |
3 | + - jbj: display dependency loops as an error for now. | |
4 | - glen: do not skip %clean from spec file | |
5 | - robert: install rpmdeps and debugedit to pkglibdir as on HEAD | |
6 | - jbj: fix: python ts.hdrFromFdno(fdno) segfault. | |
fe4a55c2 ER |
7 | --- rpm-5.4.16/lib/order.c~ 2016-03-16 00:20:19.000000000 +0200 |
8 | +++ rpm-5.4.16/lib/order.c 2016-03-16 00:20:57.082078559 +0200 | |
26ea8a78 JR |
9 | @@ -1631,7 +1631,7 @@ |
10 | (void) orgrpmAddRelation(ts, al, p, requires); | |
11 | } | |
a3809792 | 12 | |
26ea8a78 JR |
13 | -#ifdef NOTYET |
14 | +#if defined(RPM_VENDOR_PLD) | |
15 | /* Ensure that erasures follow installs during upgrades. */ | |
16 | if (rpmteType(p) == TR_REMOVED && p->flink.Pkgid && p->flink.Pkgid[0]) { | |
17 | rpmtsi qi; | |
18 | @@ -1652,7 +1652,7 @@ | |
a3809792 | 19 | } |
26ea8a78 | 20 | qi = rpmtsiFree(qi); |
a3809792 | 21 | } |
26ea8a78 JR |
22 | -#endif /* NOTYET */ |
23 | +#endif | |
a3809792 | 24 | |
26ea8a78 JR |
25 | #ifdef NOTYET |
26 | /* Order by requiring parent directories as prerequisites. */ | |
fe4a55c2 | 27 | @@ -2182,7 +2182,7 @@ |
a3809792 | 28 | const char * dp; |
26ea8a78 JR |
29 | rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) |
30 | ? RPMLOG_WARNING : RPMLOG_ERR; | |
fe4a55c2 ER |
31 | -#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) /* loop-detection-optional-loglevel */ |
32 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) || defined(RPM_VENDOR_PLD) /* loop-detection-optional-loglevel */ | |
26ea8a78 JR |
33 | // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable |
34 | msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); | |
35 | #endif |