[CMF-checkins] CVS: Products/CMFCore - Skinnable.py:1.15.2.3

[Florent Guillaume]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv9308/CMFCore

Modified Files:
      Tag: CMF-1_5-branch
	Skinnable.py 
Log Message:
Don't catch ConflictError.


=== Products/CMFCore/Skinnable.py 1.15.2.2 => 1.15.2.3 ===
--- Products/CMFCore/Skinnable.py:1.15.2.2	Sun Mar 27 12:33:57 2005
+++ Products/CMFCore/Skinnable.py	Fri Apr 22 14:48:16 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.