rpm/rpm-5.2.1-silent-loop-detection_and_more_rescans.patch

21 lines
957 B
Diff
Raw Normal View History

--- rpm-5.2.1.orig/lib/depends.c 2011-03-03 14:35:01.926488612 +0100
+++ rpm-5.2.1/lib/depends.c 2011-03-08 03:17:33.663032216 +0100
@@ -2308,7 +2308,7 @@
int numOrderList;
int npeer = 128; /* XXX more than deep enough for now. */
int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer)));
- int nrescans = 10;
+ int nrescans = 20;
int _printed = 0;
char deptypechar;
size_t tsbytes;
@@ -2667,7 +2667,7 @@
const char * dp;
rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
? RPMLOG_WARNING : RPMLOG_ERR;
-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) /* loop-detection-optional-loglevel */
// Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
#endif