[CMF-checkins] CVS: CMF/CMFCore - MembershipTool.py:1.45

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv30337/CMFCore

Modified Files:
	MembershipTool.py 
Log Message:
Merge from 1.4 branch: don't swallow ConflictError during wrapUser.


=== CMF/CMFCore/MembershipTool.py 1.44 => 1.45 ===
--- CMF/CMFCore/MembershipTool.py:1.44	Sun Jan 25 10:25:59 2004
+++ CMF/CMFCore/MembershipTool.py	Thu Jan 29 11:34:06 2004
@@ -28,6 +28,7 @@
 from Globals import InitializeClass
 from Globals import MessageDialog
 from Globals import PersistentMapping
+from ZODB.POSException import ConflictError
 
 from ActionProviderBase import ActionProviderBase
 from CMFCoreExceptions import AccessControl_Unauthorized
@@ -136,6 +137,8 @@
         if mdtool:
             try:
                 u = mdtool.wrapUser(u)
+            except ConflictError:
+                raise
             except:
                 from zLOG import LOG, ERROR
                 import sys