RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Aug-2007 19:15:42
Branch: HEAD Handle: 2007080218154101
Modified files:
rpm CHANGES macros.in
rpm/rpmdb dbconfig.c rpmdb.h
Log:
- skeletal configgery for standalone index tables.
Summary:
Revision Changes Path
1.1546 +1 -0 rpm/CHANGES
1.193 +3 -3 rpm/macros.in
1.44 +2 -0 rpm/rpmdb/dbconfig.c
1.63 +2 -1 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1545 -r1.1546 CHANGES
--- rpm/CHANGES 2 Aug 2007 16:34:52 -0000 1.1545
+++ rpm/CHANGES 2 Aug 2007 17:15:41 -0000 1.1546
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: skeletal configgery for standalone index tables.
- jbj: another header-extension-less hack-a-round.
- jbj: hack up a NVRA retrival w/o extensions, sigh.
- jbj: add RPMTAG_NVRA header extension.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.192 -r1.193 macros.in
--- rpm/macros.in 2 Aug 2007 15:49:46 -0000 1.192
+++ rpm/macros.in 2 Aug 2007 17:15:42 -0000 1.193
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.192 2007/08/02 15:49:46 jbj Exp $
+# $Id: macros.in,v 1.193 2007/08/02 17:15:42 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -672,7 +672,7 @@
%_dbi_config_3_Triggername %{_dbi_btconfig}
%_dbi_config_3_Packages %{_dbi_btconfig} lockdbfd
%_dbi_config_3_Depends %{_dbi_btconfig} temporary private
-%_dbi_config_3_Nvra %{_dbi_btconfig}
+%_dbi_config_3_Nvra %{_dbi_btconfig} noload
# database configuration: SQLite [dbapi 4 hooks]
%_dbi_config_4 %{_dbi_sqlconfig}
@@ -695,7 +695,7 @@
%_dbi_config_4_Triggername %{_dbi_sqlconfig}
%_dbi_config_4_Packages %{_dbi_sqlconfig}
%_dbi_config_4_Depends %{_dbi_sqlconfig} temporary private
-%_dbi_config_4_Nvra %{_dbi_btconfig}
+%_dbi_config_4_Nvra %{_dbi_btconfig} noload
# database configuration [code entry hooks]
%_dbi_config %{expand:%%{_dbi_config_%{_dbapi_used}}}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.43 -r1.44 dbconfig.c
--- rpm/rpmdb/dbconfig.c 27 Jul 2007 18:50:19 -0000 1.43
+++ rpm/rpmdb/dbconfig.c 2 Aug 2007 17:15:42 -0000 1.44
@@ -300,6 +300,8 @@
{ "lockdbfd", 0,POPT_ARG_NONE, &db3dbi.dbi_lockdbfd, 0,
NULL, NULL },
#endif
+ { "noload", 0,POPT_ARG_NONE, &db3dbi.dbi_noload, 0,
+ NULL, NULL },
{ "temporary", 0,POPT_ARG_NONE, &db3dbi.dbi_temporary, 0,
NULL, NULL },
#if defined(WITH_DB)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.62 -r1.63 rpmdb.h
--- rpm/rpmdb/rpmdb.h 22 Jul 2007 22:10:27 -0000 1.62
+++ rpm/rpmdb/rpmdb.h 2 Aug 2007 17:15:42 -0000 1.63
@@ -308,7 +308,8 @@
int dbi_no_fsync; /*!< no-op fsync for db */
int dbi_no_dbsync; /*!< don't call dbiSync */
int dbi_lockdbfd; /*!< do fcntl lock on db fd */
- int dbi_temporary; /*!< non-persistent */
+ int dbi_temporary; /*!< non-persistent index/table */
+ int dbi_noload; /*!< standalone index/table */
int dbi_debug;
int dbi_byteswapped;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
