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

[Florent Guillaume]

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

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


=== Products/CMFCore/Skinnable.py 1.10.6.3 => 1.10.6.4 ===
--- Products/CMFCore/Skinnable.py:1.10.6.3	Fri Apr 23 17:11:33 2004
+++ Products/CMFCore/Skinnable.py	Fri Apr 22 15:14:51 2005
@@ -23,6 +23,7 @@
 from Acquisition import ImplicitAcquisitionWrapper, aq_base, aq_inner
 from ExtensionClass import Base
 from AccessControl import ClassSecurityInfo
+from ZODB.POSException import ConflictError
 
 
 # superGetAttr is assigned to whatever ObjectManager.__getattr__
@@ -141,6 +142,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.