Log message for revision 78754: - Collector #2332: SessionDataManger: don't swallow ConflictErrors
Changed: U Zope/trunk/doc/CHANGES.txt U Zope/trunk/lib/python/Products/Sessions/SessionDataManager.py -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2007-08-12 09:38:54 UTC (rev 78753) +++ Zope/trunk/doc/CHANGES.txt 2007-08-12 09:52:08 UTC (rev 78754) @@ -135,6 +135,8 @@ Bugs Fixed + - Collector #2332: SessionDataManger: don't swallow ConflictErrors + - ZopePageTemplate's pt_edit did not recognize content type arguments which had a charset information included. Modified: Zope/trunk/lib/python/Products/Sessions/SessionDataManager.py =================================================================== --- Zope/trunk/lib/python/Products/Sessions/SessionDataManager.py 2007-08-12 09:38:54 UTC (rev 78753) +++ Zope/trunk/lib/python/Products/Sessions/SessionDataManager.py 2007-08-12 09:52:08 UTC (rev 78754) @@ -15,6 +15,7 @@ from logging import getLogger import Globals from OFS.SimpleItem import Item +/bin/bash: line 1: /tmp/yy: No such file or directory from Acquisition import Implicit, Explicit, aq_base from Persistence import Persistent from AccessControl.Owned import Owned @@ -219,6 +220,8 @@ LOG.debug('External data container at %s in use' % args) self._v_wrote_dc_type = 1 return self.unrestrictedTraverse(self.obpath) + except ConflictError: + raise except: raise SessionDataManagerErr, ( "External session data container '%s' not found." % _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins