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:44:06
Branch: rpm-5_4 Handle: 2011071210440501
Modified files: (Branch: rpm-5_4)
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.3501.2.147+2 -0 rpm/CHANGES
2.170.2.10 +1 -1 rpm/lib/rpmds.c
1.37.2.3 +1 -1 rpm/rpmdb/rpmevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.146 -r1.3501.2.147 CHANGES
--- rpm/CHANGES 12 Jul 2011 10:42:58 -0000 1.3501.2.146
+++ rpm/CHANGES 12 Jul 2011 10:44:06 -0000 1.3501.2.147
@@ -1,4 +1,6 @@
5.4.1 -> 5.4.2
+ - 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.170.2.9 -r2.170.2.10 rpmds.c
--- rpm/lib/rpmds.c 11 Apr 2011 05:09:55 -0000 2.170.2.9
+++ rpm/lib/rpmds.c 12 Jul 2011 10:44:05 -0000 2.170.2.10
@@ -4065,7 +4065,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.37.2.2 -r1.37.2.3 rpmevr.c
--- rpm/rpmdb/rpmevr.c 20 Apr 2011 15:57:00 -0000 1.37.2.2
+++ rpm/rpmdb/rpmevr.c 12 Jul 2011 10:44:05 -0000 1.37.2.3
@@ -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
