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: 12-Jul-2011 12:45:07
Branch: rpm-5_3 Handle: 2011071210450302
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmdb rpmevr.c
Log:
fix rpm not comparing distepoch if missing from one package when doing
comparision.
Summary:
Revision Changes Path
1.3296.2.244+2 -0 rpm/CHANGES
2.167.2.16 +1 -1 rpm/lib/rpmds.c
1.36.2.4 +1 -1 rpm/rpmdb/rpmevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.243 -r1.3296.2.244 CHANGES
--- rpm/CHANGES 12 Jul 2011 10:44:41 -0000 1.3296.2.243
+++ rpm/CHANGES 12 Jul 2011 10:45:05 -0000 1.3296.2.244
@@ -1,4 +1,6 @@
5.3.12 -> 5.3.13
+ - proyvind: fix rpm not comparing distepoch if missing from one package
+ when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
as equal, preventing upgrades between them.
- proyvind: dbconvert: fix segfault when no root is specified.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.167.2.15 -r2.167.2.16 rpmds.c
--- rpm/lib/rpmds.c 28 Apr 2011 15:49:04 -0000 2.167.2.15
+++ rpm/lib/rpmds.c 12 Jul 2011 10:45:03 -0000 2.167.2.16
@@ -4333,7 +4333,7 @@
case 'D': ix = RPMEVR_D; /*@switchbreak@*/break;
}
#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
- if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
+ if(ix == RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
&& *(b->F[ix]) == '\0')
break;
if (a->F[ix] && b->F[ix])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmevr.c
============================================================================
$ cvs diff -u -r1.36.2.3 -r1.36.2.4 rpmevr.c
--- rpm/rpmdb/rpmevr.c 20 Apr 2011 16:17:09 -0000 1.36.2.3
+++ rpm/rpmdb/rpmevr.c 12 Jul 2011 10:45:04 -0000 1.36.2.4
@@ -286,7 +286,7 @@
case 'D': ix = RPMEVR_D; /*@switchbreak@*/break;
}
#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
- if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
+ if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
&& *(b->F[ix]) == '\0')
break;
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
