]>
Commit | Line | Data |
---|---|---|
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. | |
7 | --- rpm-5.4.10/lib/order.c~ 2012-07-06 17:39:16.000000000 +0200 | |
8 | +++ rpm-5.4.10/lib/order.c 2012-09-03 23:09:03.706487979 +0200 | |
9 | @@ -1631,7 +1631,7 @@ | |
10 | (void) orgrpmAddRelation(ts, al, p, requires); | |
11 | } | |
12 | ||
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 @@ | |
19 | } | |
20 | qi = rpmtsiFree(qi); | |
21 | } | |
22 | -#endif /* NOTYET */ | |
23 | +#endif | |
24 | ||
25 | #ifdef NOTYET | |
26 | /* Order by requiring parent directories as prerequisites. */ | |
27 | @@ -2175,7 +2175,7 @@ | |
28 | const char * dp; | |
29 | rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) | |
30 | ? RPMLOG_WARNING : RPMLOG_ERR; | |
31 | -#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ | |
32 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* loop-detection-optional-loglevel */ | |
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 |