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-Feb-2011 00:12:50
Branch: rpm-5_3 Handle: 2011021223124900
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/rpmdb rpmdb.c
Log:
fix rpmmiCount() not resetting db cursor after use, breaking iterator
(mdvbz#62279)
Summary:
Revision Changes Path
1.3296.2.159+4 -0 rpm/CHANGES
1.386.2.8 +1 -0 rpm/rpmdb/rpmdb.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.158 -r1.3296.2.159 CHANGES
--- rpm/CHANGES 11 Feb 2011 15:33:22 -0000 1.3296.2.158
+++ rpm/CHANGES 12 Feb 2011 23:12:49 -0000 1.3296.2.159
@@ -1,3 +1,7 @@
+5.3.8 -> 5.3.9:
+ - proyvind: fix rpmmiCount() not resetting db cursor after use, breaking
+ iterator (mdvbz#62279)
+
5.3.7 -> 5.3.8:
- devzero2000: update INSTALL.developer with some jbj consideration
on how to use multiple rpm version.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.386.2.7 -r1.386.2.8 rpmdb.c
--- rpm/rpmdb/rpmdb.c 16 Dec 2010 14:18:11 -0000 1.386.2.7
+++ rpm/rpmdb/rpmdb.c 12 Feb 2011 23:12:49 -0000 1.386.2.8
@@ -1645,6 +1645,7 @@
if (k.data && k.size == 0) k.size++; /* XXX "/" fixup. */
if (!dbiGet(dbi, mi->mi_dbc, &k, &v, DB_SET))
xx = dbiCount(dbi, mi->mi_dbc, &mi->mi_count, 0);
+ mi->mi_dbc = NULL;
}
rc = (mi ? mi->mi_count : 0);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
