diff options
| author | drochner <drochner> | 2008-09-18 17:11:01 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2008-09-18 17:11:01 +0000 |
| commit | baf979c89cae454081080548bfebecd72d07388f (patch) | |
| tree | ccc003f6769367e43bbaacbc47e53c5fe2f69be2 /databases/gramps3/patches | |
| parent | c7afe15917f8f6397c4f54644dcf2d5566d4bce5 (diff) | |
| download | pkgsrc-baf979c89cae454081080548bfebecd72d07388f.tar.gz | |
try to deal with incompatible changes in py-bsddb3-4.7.2
(I'm not sure commenting out DB_TXN_NOSYNC is the best solution, but
it seems to work for me at least.)
approved by gdt
Diffstat (limited to 'databases/gramps3/patches')
| -rw-r--r-- | databases/gramps3/patches/patch-ae | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/databases/gramps3/patches/patch-ae b/databases/gramps3/patches/patch-ae index e714f7ea3fe..ff831d3313d 100644 --- a/databases/gramps3/patches/patch-ae +++ b/databases/gramps3/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2008/06/18 22:21:13 gdt Exp $ +$NetBSD: patch-ae,v 1.2 2008/09/18 17:11:01 drochner Exp $ ---- src/gen/db/dbdir.py.orig 2008-05-17 16:14:29.000000000 -0400 +--- src/gen/db/dbdir.py.orig 2008-05-17 22:14:29.000000000 +0200 +++ src/gen/db/dbdir.py @@ -36,7 +36,7 @@ import time from types import InstanceType @@ -11,3 +11,39 @@ $NetBSD: patch-ae,v 1.1.1.1 2008/06/18 22:21:13 gdt Exp $ import logging _LOG = logging.getLogger(".GrampsDb") +@@ -480,7 +480,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa + # These env settings are only needed for Txn environment + self.env.set_lk_max_locks(25000) + self.env.set_lk_max_objects(25000) +- self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs ++ self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1) # clean up unused logs + + # The DB_PRIVATE flag must go if we ever move to multi-user setup + env_flags = db.DB_CREATE | db.DB_PRIVATE |\ +@@ -1556,7 +1556,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa + transaction = BdbTransaction(msg, self.undodb, batch, no_magic) + if transaction.batch: + self.env.txn_checkpoint() +- self.env.set_flags(db.DB_TXN_NOSYNC, 1) # async txn ++# self.env.set_flags(db.DB_TXN_NOSYNC, 1) # async txn + + if self.secondary_connected and not transaction.no_magic: + # Disconnect unneeded secondary indices +@@ -1594,7 +1594,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa + self.txn.commit() + if transaction.batch: + self.env.txn_checkpoint() +- self.env.set_flags(db.DB_TXN_NOSYNC, 0) # sync txn ++# self.env.set_flags(db.DB_TXN_NOSYNC, 0) # sync txn + + if not transaction.no_magic: + # create new secondary indices to replace the ones removed +@@ -1697,7 +1697,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa + # These env settings are only needed for Txn environment + self.env.set_lk_max_locks(25000) + self.env.set_lk_max_objects(25000) +- self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs ++ self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1) # clean up unused logs + + # The DB_PRIVATE flag must go if we ever move to multi-user setup + env_flags = db.DB_CREATE | db.DB_PRIVATE |\ |