RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 06-Sep-2009 19:27:16 Branch: HEAD Handle: 2009090617271600 Modified files: rpm/lib depends.c Log: - fix: Fedorable openoffice has so so many dependency loops, I give up ... Summary: Revision Changes Path 1.447 +7 -1 rpm/lib/depends.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/depends.c ============================================================================ $ cvs diff -u -r1.446 -r1.447 depends.c --- rpm/lib/depends.c 22 Aug 2009 22:12:02 -0000 1.446 +++ rpm/lib/depends.c 6 Sep 2009 17:27:16 -0000 1.447 @@ -2310,7 +2310,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 = 100; int _printed = 0; char deptypechar; size_t tsbytes; @@ -2321,6 +2321,9 @@ int qlen; int i, j; +if (_rpmts_debug) +fprintf(stderr, "--> %s(%p) tsFlags 0x%x\n", __FUNCTION__, ts, rpmtsFlags(ts)); + #ifdef DYING rpmalMakeIndex(ts->addedPackages); #endif @@ -2806,6 +2809,9 @@ int rc = 0; int ourrc = 0; +if (_rpmts_debug) +fprintf(stderr, "--> %s(%p) tsFlags 0x%x\n", __FUNCTION__, ts, rpmtsFlags(ts)); + (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_CHECK), 0); /* Do lazy, readonly, open of rpm database. */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org