RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 20-Mar-2009 15:47:42
Branch: rpm-5_1 Handle: 2009032014474101
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/lib poptALL.c
rpm/rpmdb librpmdb.vers
Log:
- yarn: stub-in rpmmi pool handling under NOTYET.
Summary:
Revision Changes Path
1.2288.2.223+1 -0 rpm/CHANGES
2.90.2.15 +6 -0 rpm/lib/poptALL.c
1.43.2.9 +1 -0 rpm/rpmdb/librpmdb.vers
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.222 -r1.2288.2.223 CHANGES
--- rpm/CHANGES 20 Mar 2009 13:12:53 -0000 1.2288.2.222
+++ rpm/CHANGES 20 Mar 2009 14:47:41 -0000 1.2288.2.223
@@ -1,4 +1,5 @@
5.1.7 -> 5.1.8:
+ - jbj: yarn: stub-in rpmmi pool handling under NOTYET.
- jbj: QNX: avoid conflicting db defines for __mutex_lock/__mutex_unlock.
- jbj: yarn: convert rpmdb refcount to usage mutex.
- jbj: yarn: convert psm refcount to usage mutex.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.90.2.14 -r2.90.2.15 poptALL.c
--- rpm/lib/poptALL.c 19 Mar 2009 19:50:09 -0000 2.90.2.14
+++ rpm/lib/poptALL.c 20 Mar 2009 14:47:42 -0000 2.90.2.15
@@ -451,6 +451,9 @@
/*...@modifies keyids @*/
{
extern rpmioPool _headerPool;
+#ifdef NOTYET
+ extern rpmioPool _rpmmiPool;
+#endif
extern rpmioPool _rpmdbPool;
_rpmgiPool = rpmioFreePool(_rpmgiPool);
@@ -466,6 +469,9 @@
_rpmdsPool = rpmioFreePool(_rpmdsPool);
_rpmfiPool = rpmioFreePool(_rpmfiPool);
+#ifdef NOTYET
+ _rpmmiPool = rpmioFreePool(_rpmmiPool);
+#endif
_rpmdbPool = rpmioFreePool(_rpmdbPool);
_headerPool = rpmioFreePool(_headerPool);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/librpmdb.vers
============================================================================
$ cvs diff -u -r1.43.2.8 -r1.43.2.9 librpmdb.vers
--- rpm/rpmdb/librpmdb.vers 19 Mar 2009 19:50:09 -0000 1.43.2.8
+++ rpm/rpmdb/librpmdb.vers 20 Mar 2009 14:47:42 -0000 1.43.2.9
@@ -87,6 +87,7 @@
rpmCheckPassPhrase;
rpmDatabasePoptTable;
_rpmdbPool;
+ _rpmmiPool;
rpmdbAdd;
rpmdbAppendIterator;
rpmDBArgs;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
