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

[Florent Guillaume]

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

Modified Files:
      Tag: CMF-1_3-branch
	MembershipTool.py 
Log Message:
Merge from 1.4 branch: don't swallow ConflictError during wrapUser.


=== CMF/CMFCore/MembershipTool.py 1.23.4.5 => 1.23.4.6 ===
--- CMF/CMFCore/MembershipTool.py:1.23.4.5	Mon Oct 27 11:58:33 2003
+++ CMF/CMFCore/MembershipTool.py	Thu Jan 29 12:35:46 2004
@@ -21,6 +21,7 @@
 from OFS.SimpleItem import SimpleItem
 from Globals import InitializeClass, DTMLFile, MessageDialog, \
      PersistentMapping
+from ZODB.POSException import ConflictError
 from Acquisition import aq_base
 from AccessControl.User import nobody
 from AccessControl import ClassSecurityInfo
@@ -136,7 +137,8 @@
                         self.createMemberarea(portal_user.getId())
 
                 return portal_user
-
+            except ConflictError:
+                raise
             except:
                 from zLOG import LOG, ERROR
                 import sys