# HG changeset patch
# User Richard Jones <richard@users.sourceforge.net>
# Date 1094553615 0
# Node ID bdf3a73dfd04ac4e3ddd60a2da3711b0a8682c94
# Parent  f48a81d49a86c4971ea17283984298ddc017ff0f
merge from maint-0-7

diff -r f48a81d49a86 -r bdf3a73dfd04 CHANGES.txt
--- a/CHANGES.txt	Fri Sep 03 02:24:14 2004 +0000
+++ b/CHANGES.txt	Tue Sep 07 10:40:15 2004 +0000
@@ -36,6 +36,8 @@
 - removed references to py2.3+ boolean values (sf bug 995682)
 - fix static file path normalisation in security check (thanks David Linke)
 - less specific messages for login failures (thanks Chris Withers)
+- Reject raised against email messages should result in email rejection, not
+  discarding of the message
 
 
 2004-07-21 0.7.6
diff -r f48a81d49a86 -r bdf3a73dfd04 roundup/mailgw.py
--- a/roundup/mailgw.py	Fri Sep 03 02:24:14 2004 +0000
+++ b/roundup/mailgw.py	Tue Sep 07 10:40:15 2004 +0000
@@ -74,7 +74,7 @@
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.153 2004-07-28 02:29:45 richard Exp $
+$Id: mailgw.py,v 1.154 2004-09-07 10:40:15 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -905,9 +905,11 @@
                     recipients=recipients, date=date.Date('.'),
                     summary=summary, content=content, files=files,
                     messageid=messageid, inreplyto=inreplyto, **msg_props)
-            except exceptions.Reject:
-                pass
-            else:
+            except exceptions.Reject, error:
+                raise MailUsageError, '''
+Mail message was rejected by a detector.
+%s
+'''%error
                 # attach the message to the node
                 if nodeid:
                     # add the message to the node's list