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: 14-Feb-2011 02:54:22
Branch: rpm-5_4 Handle: 2011021401542200
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb rpmdb.c
Log:
set mi->mi_count when rpmmiNext() initializes db cursor so that
rpmmiCount() won't break (mdvbz#62267)
Summary:
Revision Changes Path
1.3501.2.58 +2 -0 rpm/CHANGES
1.392.2.4 +3 -0 rpm/rpmdb/rpmdb.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.57 -r1.3501.2.58 CHANGES
--- rpm/CHANGES 12 Feb 2011 23:12:26 -0000 1.3501.2.57
+++ rpm/CHANGES 14 Feb 2011 01:54:22 -0000 1.3501.2.58
@@ -1,4 +1,6 @@
5.4.0 -> 5.4.1:
+ - proyvind: set mi->mi_count when rpmmiNext() initializes db cursor so
that
+ rpmmiCount() won't break (mdvbz#62267)
- proyvind: fix rpmmiCount() not resetting db cursor after use, breaking
iterator (mdvbz#62279)
- devzero2000: update INSTALL.developer with some jbj consideration
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.3 -r1.392.2.4 rpmdb.c
--- rpm/rpmdb/rpmdb.c 1 Jan 2011 14:39:55 -0000 1.392.2.3
+++ rpm/rpmdb/rpmdb.c 14 Feb 2011 01:54:22 -0000 1.392.2.4
@@ -2154,6 +2154,9 @@
if (k.data && k.size == 0) k.size = (UINT32_T) strlen((char *)k.data);
if (k.data && k.size == 0) k.size++; /* XXX "/" fixup. */
_flags = DB_SET;
+ if (!dbiGet(dbi, mi->mi_dbc, &k, &v, _flags))
+ xx = dbiCount(dbi, mi->mi_dbc, &mi->mi_count, 0);
+
} else
_flags = (mi->mi_setx ? DB_NEXT_DUP : DB_SET);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
