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: 27-Aug-2014 19:40:44
Branch: rpm-5_4 Handle: 2014082717404300
Modified files: (Branch: rpm-5_4)
rpm/rpmdb db3.c
Log:
- bdb: nuke erroneous comment, add must-be-zero db_env_create flags
assertion.
- bdb: set dbenv_>app_private = rpmdb.
Summary:
Revision Changes Path
1.156.2.19 +3 -1 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156.2.18 -r1.156.2.19 db3.c
--- rpm/rpmdb/db3.c 27 Aug 2014 14:32:54 -0000 1.156.2.18
+++ rpm/rpmdb/db3.c 27 Aug 2014 17:40:43 -0000 1.156.2.19
@@ -991,7 +991,7 @@
dbi->dbi_ecflags &= ~DB_RPCCLIENT;
#endif
- /* XXX DB_THREAD from dbi->dbi_oeflags? */
+assert(dbi->dbi_ecflags == 0);
rc = db_env_create(&dbenv, dbi->dbi_ecflags);
rc = cvtdberr(dbi, "db_env_create", rc, _debug);
if (dbenv == NULL || rc)
@@ -2499,6 +2499,7 @@
}
rpmlog(RPMLOG_NOTICE, _(".\nrecovery succeeded.\n"));
assert(dbenv);
+ dbenv->app_private = rpmdb;
rpmdb->db_dbenv = dbenv;
rpmdb->db_opens = 1;
break;
@@ -2532,6 +2533,7 @@
/*@fallthrough@*/
case 0:
assert(dbenv);
+ dbenv->app_private = rpmdb;
rpmdb->db_dbenv = dbenv;
rpmdb->db_opens = 1;
break;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
