[Zope-Checkins] CVS: ZODB3/ZEO - version.txt:1.3.12.5 __init__.py:1.12.2.5 ClientStorage.py:1.73.2.6

Jeremy Hylton jeremy@zope.com
Fri, 15 Nov 2002 12:18:56 -0500


Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv1715/ZEO

Modified Files:
      Tag: ZODB3-3_1-branch
	version.txt __init__.py ClientStorage.py 
Log Message:
Fix two restore() bugs.

Merge changes from short-lived ZODB3-restore-debug-branch.
Add entry to NEWS file about problem.
Bump version numbers to 3.1.1 and 2.0.1.


=== ZODB3/ZEO/version.txt 1.3.12.4 => 1.3.12.5 ===
--- ZODB3/ZEO/version.txt:1.3.12.4	Wed Oct 23 15:46:52 2002
+++ ZODB3/ZEO/version.txt	Fri Nov 15 12:18:56 2002
@@ -1 +1,2 @@
-2.0
+2.0.1
+


=== ZODB3/ZEO/__init__.py 1.12.2.4 => 1.12.2.5 ===
--- ZODB3/ZEO/__init__.py:1.12.2.4	Wed Oct 23 15:46:52 2002
+++ ZODB3/ZEO/__init__.py	Fri Nov 15 12:18:56 2002
@@ -21,4 +21,4 @@
 
 """
 
-version = "2.0"
+version = "2.0.1"


=== ZODB3/ZEO/ClientStorage.py 1.73.2.5 => 1.73.2.6 ===
--- ZODB3/ZEO/ClientStorage.py:1.73.2.5	Tue Nov 12 15:18:09 2002
+++ ZODB3/ZEO/ClientStorage.py	Fri Nov 15 12:18:56 2002
@@ -636,10 +636,14 @@
         """Internal helper to end a transaction."""
         # the right way to set self._transaction to None
         # calls notify() on _tpc_cond in case there are waiting threads
+        self._ltid = self._serial
         self._tpc_cond.acquire()
         self._transaction = None
         self._tpc_cond.notify()
         self._tpc_cond.release()
+
+    def lastTransaction(self):
+        return self._ltid
 
     def tpc_abort(self, transaction):
         """Storage API: abort a transaction."""