[Zope-Checkins] CVS: Packages/ZEO - ClientCache.py:1.47.4.3

Andreas Jung andreas at andreas-jung.com
Fri Jul 16 02:55:48 EDT 2004


Update of /cvs-repository/Packages/ZEO
In directory cvs.zope.org:/tmp/cvs-serv9990

Modified Files:
      Tag: Zope-2_7-branch
	ClientCache.py 
Log Message:
patch by Dieter Maurer to fix check for temporary caches


=== Packages/ZEO/ClientCache.py 1.47.4.2 => 1.47.4.3 ===
--- Packages/ZEO/ClientCache.py:1.47.4.2	Thu Feb 26 15:36:48 2004
+++ Packages/ZEO/ClientCache.py	Fri Jul 16 02:55:47 2004
@@ -568,7 +568,12 @@
                 for oid in index.keys():
                     if (index[oid] < 0) == current:
                         del index[oid]
-                if self._p[current] is not None:
+                # DM 2004-07-16: the following code broke with Zope 2.7.1
+                #   as "_p" got a descriptive name to improve logging :-(
+                #   Use "_client is None" to check for a temporary cache
+                #   as this is used at other places, too!
+                # if self._p[current] is not None:
+                if self._client is not None:
                     # Persistent cache file: remove the old file
                     # before opening the new one, because the old file
                     # may be owned by root (created before setuid()).



More information about the Zope-Checkins mailing list