[Erp5-report] r7323 - /erp5/trunk/products/ERP5Type/patches/CMFMailIn.py

[nobody at svn.erp5.org]

Author: romain
Date: Wed May 17 15:25:45 2006
New Revision: 7323

URL: http://svn.erp5.org?rev=7323&view=rev
Log:
Catch ConflictError

Modified:
    erp5/trunk/products/ERP5Type/patches/CMFMailIn.py

Modified: erp5/trunk/products/ERP5Type/patches/CMFMailIn.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/CMFMailIn.py?rev=7323&r1=7322&r2=7323&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/CMFMailIn.py (original)
+++ erp5/trunk/products/ERP5Type/patches/CMFMailIn.py Wed May 17 15:25:45 2006
@@ -16,6 +16,7 @@
 import email
 from email.Header import decode_header
 from email.Utils import parseaddr
+from ZODB.POSException import ConflictError
 
 import traceback
 import StringIO
@@ -91,6 +92,10 @@
     try:
       return self.restrictedTraverse(portal_url+self.method)\
                                                     (theMail=theMail)
+    except ConflictError:
+      # XXX Warning: if exception is raised, the MTA will
+      # not return the mail to the sender
+      raise
     except:
       # It's needed to catch all exceptions, as we need to return
       # a value to the MTA in this case.