[CVS] RPM: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
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: 13-Jul-2011 16:49:50 Branch: HEAD Handle: 2011071314494901 Modified files: rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.181 +4 -3 rpm/lib/rpmds.c 1.41+4 -3 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.180 -r2.181 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:41:18 - 2.180 +++ rpm/lib/rpmds.c 13 Jul 2011 14:49:49 - 2.181 @@ -4065,9 +4065,10 @@ 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(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (bFlags & RPMSENSE_LESS)) + && *(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]) @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.40 -r1.41 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:41:19 - 1.40 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:49:50 - 1.41 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) - && *(b->F[ix]) == '\0') - break; + if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (b->Flags & RPMSENSE_LESS)) + && *(b->F[ix]) == '\0') + break; #endif rc = compare_values(a->F[ix], b->F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
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: 13-Jul-2011 16:50:07 Branch: rpm-5_4 Handle: 2011071314500601 Modified files: (Branch: rpm-5_4) rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.170.2.11 +4 -3 rpm/lib/rpmds.c 1.37.2.4+4 -3 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.170.2.10 -r2.170.2.11 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:44:05 - 2.170.2.10 +++ rpm/lib/rpmds.c 13 Jul 2011 14:50:06 - 2.170.2.11 @@ -4065,9 +4065,10 @@ 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(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (bFlags & RPMSENSE_LESS)) + && *(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]) @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.37.2.3 -r1.37.2.4 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:44:05 - 1.37.2.3 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:50:07 - 1.37.2.4 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) - && *(b->F[ix]) == '\0') - break; + if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (b->Flags & RPMSENSE_LESS)) + && *(b->F[ix]) == '\0') + break; #endif rc = compare_values(a->F[ix], b->F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
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: 13-Jul-2011 16:50:20 Branch: rpm-5_3 Handle: 2011071314502000 Modified files: (Branch: rpm-5_3) rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.167.2.17 +4 -3 rpm/lib/rpmds.c 1.36.2.5+4 -3 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.167.2.16 -r2.167.2.17 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:45:03 - 2.167.2.16 +++ rpm/lib/rpmds.c 13 Jul 2011 14:50:20 - 2.167.2.17 @@ -4333,9 +4333,10 @@ 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(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (bFlags & RPMSENSE_LESS)) + && *(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]) @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.36.2.4 -r1.36.2.5 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:45:04 - 1.36.2.4 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:50:20 - 1.36.2.5 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) - && *(b->F[ix]) == '\0') - break; + if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && !(ix == RPMEVR_D && (b->Flags & RPMSENSE_LESS)) + && *(b->F[ix]) == '\0') + break; #endif rc = compare_values(a->F[ix], b->F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
