diff options
| author | msapiro <> | 2006-03-01 02:34:10 +0000 |
|---|---|---|
| committer | msapiro <> | 2006-03-01 02:34:10 +0000 |
| commit | 2f940a523ff299df85e6df9fe7fb74c23eb0eb21 (patch) | |
| tree | 0984aa801fecaa2bae0767666fa55c31585d27cc /Mailman/Bouncers/BouncerAPI.py | |
| parent | 505c0fa8e08a38483753c1d3cfbdbfa93c85cf42 (diff) | |
| download | mailman2-2f940a523ff299df85e6df9fe7fb74c23eb0eb21.tar.gz mailman2-2f940a523ff299df85e6df9fe7fb74c23eb0eb21.tar.xz mailman2-2f940a523ff299df85e6df9fe7fb74c23eb0eb21.zip | |
Changed BouncerAPI.py to return Stop from a Bouncer and changed
BounceRunner.py to discard the bounce when Stop returned. Changed
DSN.py to recognize Action: headers with comments. Changed Qmail.py
to recognize an observed different starting string.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Bouncers/BouncerAPI.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Mailman/Bouncers/BouncerAPI.py b/Mailman/Bouncers/BouncerAPI.py index e99d00ae..e19c53f7 100644 --- a/Mailman/Bouncers/BouncerAPI.py +++ b/Mailman/Bouncers/BouncerAPI.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2006 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Contains all the common functionality for msg bounce scanning API. @@ -62,10 +63,7 @@ def ScanMessages(mlist, msg): modname = 'Mailman.Bouncers.' + module __import__(modname) addrs = sys.modules[modname].process(msg) - if addrs is Stop: - # One of the detectors recognized the bounce, but there were no - # addresses to extract. Return the empty list. - return [] - elif addrs: + if addrs: + # Return addrs even if it is Stop. BounceRunner needs this info. return addrs return [] |