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: 26-Oct-2010 18:17:39 Branch: HEAD Handle: 2010102616173801 Modified files: rpm CHANGES rpm/rpmdb rpmevr.c Log: fix 'Conflicts: dependencies without release misfire'. (mdvbz#55810) Summary: Revision Changes Path 1.3486 +2 -0 rpm/CHANGES 1.37 +6 -0 rpm/rpmdb/rpmevr.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3485 -r1.3486 CHANGES --- rpm/CHANGES 26 Oct 2010 15:58:48 -0000 1.3485 +++ rpm/CHANGES 26 Oct 2010 16:17:38 -0000 1.3486 @@ -1,4 +1,6 @@ 5.3.5 -> 5.4a1: + - proyvind: mandriva: fix 'Conflicts: dependencies without release + misfire'. (mdvbz#55810) - proyvind: make sure to expand %buildroot from main package. - proyvind: filetriggers: don't bother w unneeded chroot. @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c ============================================================================ $ cvs diff -u -r1.36 -r1.37 rpmevr.c --- rpm/rpmdb/rpmevr.c 6 Mar 2010 16:20:46 -0000 1.36 +++ rpm/rpmdb/rpmevr.c 26 Oct 2010 16:17:39 -0000 1.37 @@ -277,6 +277,12 @@ for (s = rpmEVRorder(); *s != '\0'; s++) { int ix; +#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ + if(*s == 'R' && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && *(b->F[RPMEVR_R]) == '\0') + break; +#endif + switch ((int)*s) { default: continue; /*...@notreached@*/ /*...@switchbreak@*/break; case 'E': ix = RPMEVR_E; /*...@switchbreak@*/break; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org