RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Apr-2011 12:39:50 Branch: rpm-5_4 Handle: 2011040110395000 Modified files: (Branch: rpm-5_4) rpm/build reqprov.c Log: skip overlapping packages with lesser EVR Summary: Revision Changes Path 1.91.2.5 +3 -0 rpm/build/reqprov.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/build/reqprov.c ============================================================================ $ cvs diff -u -r1.91.2.4 -r1.91.2.5 reqprov.c --- rpm/build/reqprov.c 1 Apr 2011 09:52:57 -0000 1.91.2.4 +++ rpm/build/reqprov.c 1 Apr 2011 10:39:50 -0000 1.91.2.5 @@ -128,6 +128,9 @@ lEVR->Flags = Flags | RPMSENSE_EQUAL; rEVR->Flags = flags[len] | RPMSENSE_EQUAL; overlap = rpmEVRoverlap(lEVR, rEVR); + if (!overlap) + if (rpmEVRoverlap(rEVR, lEVR)) + duplicate = 1; lEVR = rpmEVRfree(lEVR); rEVR = rpmEVRfree(rEVR); } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org