Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv7999
Modified Files:
Skinnable.py
Log Message:
Don't catch ConflictError.
=== Products/CMFCore/Skinnable.py 1.17 => 1.18 ===
--- Products/CMFCore/Skinnable.py:1.17 Sun Mar 27 12:32:33 2005
+++ Products/CMFCore/Skinnable.py Fri Apr 22 14:43:51 2005
@@ -24,6 +24,7 @@
from Acquisition import ImplicitAcquisitionWrapper
from Globals import InitializeClass
from OFS.ObjectManager import ObjectManager
+from ZODB.POSException import ConflictError
# superGetAttr is assigned to whatever ObjectManager.__getattr__
@@ -165,6 +166,8 @@
w_self = ImplicitAcquisitionWrapper(self, parent)
try:
w_self.setupCurrentSkin()
+ except ConflictError:
+ raise
except:
# This shouldn't happen, even if the requested skin
# does not exist.
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
