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: 25-Jan-2011 15:47:48 Branch: rpm-5_4 Handle: 2011012514474700 Modified files: (Branch: rpm-5_4) rpm/lib rpmds.c Log: handle missing release & distepoch in rpmdsCompare() as well Summary: Revision Changes Path 2.170.2.2 +7 -0 rpm/lib/rpmds.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c ============================================================================ $ cvs diff -u -r2.170.2.1 -r2.170.2.2 rpmds.c --- rpm/lib/rpmds.c 3 Jan 2011 21:21:39 -0000 2.170.2.1 +++ rpm/lib/rpmds.c 25 Jan 2011 14:47:47 -0000 2.170.2.2 @@ -3848,7 +3848,14 @@ case 'R': ix = RPMEVR_R; /*@switchbreak@*/break; case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } +#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ + if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && *(b->F[ix]) == '\0') + break; + if (a->F[ix] && b->F[ix]) +#else if (a->F[ix] && *a->F[ix] && b->F[ix] && *b->F[ix]) +#endif /*@i@*/ sense = EVRcmp(a->F[ix], b->F[ix]); if (sense) break; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org