Skip to content

Commit e0cf53e

Browse files
author
Richard Jones
committed
Reject raised against email messages should result in email rejection...
...not discarding of the message
1 parent d6654ca commit e0cf53e

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Fixed:
88
- removed references to py2.3+ boolean values (sf bug 995682)
99
- fix static file path normalisation in security check (thanks David Linke)
1010
- less specific messages for login failures (thanks Chris Withers)
11+
- Reject raised against email messages should result in email rejection, not
12+
discarding of the message
13+
1114

1215
2004-07-21 0.7.6
1316
Fixed:

roundup/mailgw.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class node. Any parts of other types are each stored in separate files
7474
an exception, the original message is bounced back to the sender with the
7575
explanatory message given in the exception.
7676
77-
$Id: mailgw.py,v 1.149 2004-04-20 22:01:12 richard Exp $
77+
$Id: mailgw.py,v 1.149.2.1 2004-09-07 10:37:52 richard Exp $
7878
"""
7979
__docformat__ = 'restructuredtext'
8080

@@ -904,9 +904,11 @@ def handle_message(self, message):
904904
recipients=recipients, date=date.Date('.'),
905905
summary=summary, content=content, files=files,
906906
messageid=messageid, inreplyto=inreplyto, **msg_props)
907-
except exceptions.Reject:
908-
pass
909-
else:
907+
except exceptions.Reject, error:
908+
raise MailUsageError, '''
909+
Mail message was rejected by a detector.
910+
%s
911+
'''%error
910912
# attach the message to the node
911913
if nodeid:
912914
# add the message to the node's list

0 commit comments

Comments
 (0)