Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes with Python 2.5.2 and BSDDB are more subtle---seems to require checking both Python and BSDDB versions. This involves a method name change, and a flag name change.

Browse Source 
svn: r11354
This commit is contained in:
Doug Blank 2008-11-28 04:28:10 +00:00
parent 844b71addd
commit f067bf6e2c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gen/db/dbdir.py
View File

@ -32,6 +32,7 @@ This is used since GRAMPS version 3.0
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import cPickle as pickle import cPickle as pickle
import os import os
import sys
import time import time
from types import InstanceType from types import InstanceType
@ -482,12 +483,18 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback):
self.env.set_lk_max_locks(25000) self.env.set_lk_max_locks(25000)
self.env.set_lk_max_objects(25000) self.env.set_lk_max_objects(25000)
if sys.version_info < (2, 6):
if db.version() < (4, 7): if db.version() < (4, 7):
# Python 2.5 log settings # Python 2.5 log settings
self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs # clean up unused logs
self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1)
else:
# Python 2.5.2, DB 4.7.25 uses set_flags, too
self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)
else: else:
# Python 2.6 log settings (db version 4.7.25) # Python 2.6 log settings (db version 4.7.25)
self.env.log_set_config(db.DB_LOG_AUTO_REMOVE, 1) self.env.log_set_config(db.DB_LOG_AUTO_REMOVE, 1)
# The DB_PRIVATE flag must go if we ever move to multi-user setup # The DB_PRIVATE flag must go if we ever move to multi-user setup
env_flags = db.DB_CREATE | db.DB_PRIVATE |\ env_flags = db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\
@ -1908,9 +1915,14 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback):
# These env settings are only needed for Txn environment # These env settings are only needed for Txn environment
self.env.set_lk_max_locks(25000) self.env.set_lk_max_locks(25000)
self.env.set_lk_max_objects(25000) self.env.set_lk_max_objects(25000)
if sys.version_info < (2, 6):
if db.version() < (4, 7): if db.version() < (4, 7):
# Python 2.5 log settings # Python 2.5 log settings
self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs # clean up unused logs
self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1)
else:
# Python 2.5.2, DB 4.7.25 uses set_flags, too
self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)
else: else:
# Python 2.6 log settings (db version 4.7.25) # Python 2.6 log settings (db version 4.7.25)
self.env.log_set_config(db.DB_LOG_AUTO_REMOVE, 1) self.env.log_set_config(db.DB_LOG_AUTO_REMOVE, 1)