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:36
Branch: HEAD Handle: 2011040110393500
Modified files:
rpm/build reqprov.c
Log:
skip overlapping packages with lesser EVR
Summary:
Revision Changes Path
1.96 +3 -0 rpm/build/reqprov.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/reqprov.c
============================================================================
$ cvs diff -u -r1.95 -r1.96 reqprov.c
--- rpm/build/reqprov.c 1 Apr 2011 09:51:45 -0000 1.95
+++ rpm/build/reqprov.c 1 Apr 2011 10:39:35 -0000 1.96
@@ -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
