Mercurial > p > roundup > code
changeset 2670:bdf3a73dfd04
merge from maint-0-7
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 07 Sep 2004 10:40:15 +0000 |
| parents | f48a81d49a86 |
| children | 437775793d8e |
| files | CHANGES.txt roundup/mailgw.py |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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