merge from maint-0-7

Author: Richard Jones

CHANGES.txt

@@ -36,6 +36,8 @@ Fixed:
 - 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

roundup/mailgw.py

@@ -74,7 +74,7 @@ class node. Any parts of other types are each stored in separate files
 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 @@ def handle_message(self, message):
                     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