[Zope-Checkins] CVS: ZODB3/BDBStorage - BerkeleyBase.py:1.43 BDBMinimalStorage.py:1.32 BDBFullStorage.py:1.74

Jeremy Hylton jeremy at zope.com
Thu Oct 2 14:18:03 EDT 2003


Update of /cvs-repository/ZODB3/BDBStorage
In directory cvs.zope.org:/tmp/cvs-serv18770/BDBStorage

Modified Files:
	BerkeleyBase.py BDBMinimalStorage.py BDBFullStorage.py 
Log Message:
Merge changes from Zope-2_7-branch to the trunk.


=== ZODB3/BDBStorage/BerkeleyBase.py 1.42 => 1.43 ===
--- ZODB3/BDBStorage/BerkeleyBase.py:1.42	Mon Sep 15 12:29:22 2003
+++ ZODB3/BDBStorage/BerkeleyBase.py	Thu Oct  2 14:17:32 2003
@@ -16,6 +16,7 @@
 """
 
 import os
+import sys
 import time
 import errno
 import shutil
@@ -448,7 +449,9 @@
             # i.e. abort the transaction -- but swallow the exception.
             txn.abort()
         except:
-            #import traceback ; traceback.print_exc()
+##            import traceback ; traceback.print_exc()
+            zLOG.LOG(self.__class__.__name__, zLOG.DEBUG,
+                     "unexpected error in _withtxn", error=sys.exc_info())
             txn.abort()
             raise
         else:


=== ZODB3/BDBStorage/BDBMinimalStorage.py 1.31 => 1.32 ===
--- ZODB3/BDBStorage/BDBMinimalStorage.py:1.31	Mon Sep 15 12:29:22 2003
+++ ZODB3/BDBStorage/BDBMinimalStorage.py	Thu Oct  2 14:17:32 2003
@@ -125,7 +125,8 @@
         if version is None:
             self._info.put('version', BDBMINIMAL_SCHEMA_VERSION, txn=txn)
         elif version <> BDBMINIMAL_SCHEMA_VERSION:
-            raise POSException.StorageSystemError, 'incompatible storage version'
+            raise POSException.StorageSystemError(
+                'incompatible storage version')
 
     def _make_autopacker(self, event):
         return _Autopack(self, event, self._config.frequency)


=== ZODB3/BDBStorage/BDBFullStorage.py 1.73 => 1.74 ===




More information about the Zope-Checkins mailing list