diff options
| author | Mark Sapiro <msapiro@value.net> | 2007-10-04 18:40:13 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2007-10-04 18:40:13 -0700 |
| commit | 8b49009b2ae78b216f6bc9919875e52d0694908a (patch) | |
| tree | 4198ce8e6acaf4a104a9931f7222050a5f718edc /Mailman/Queue | |
| parent | 3528bd1bc8995c31efd6863bdc70d37fa23a31b1 (diff) | |
| download | mailman2-8b49009b2ae78b216f6bc9919875e52d0694908a.tar.gz mailman2-8b49009b2ae78b216f6bc9919875e52d0694908a.tar.xz mailman2-8b49009b2ae78b216f6bc9919875e52d0694908a.zip | |
/cygdrive/c/MM_bzr/log.txt
Diffstat (limited to 'Mailman/Queue')
| -rwxr-xr-x[-rw-r--r--] | Mailman/Queue/MaildirRunner.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Mailman/Queue/MaildirRunner.py b/Mailman/Queue/MaildirRunner.py index 39971ae2..d9fe02cb 100644..100755 --- a/Mailman/Queue/MaildirRunner.py +++ b/Mailman/Queue/MaildirRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2007 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. """Maildir pre-queue runner. @@ -66,11 +67,22 @@ from Mailman.Logging.Syslog import syslog # listname-request@ lre = re.compile(r""" ^ # start of string - (?P<listname>[^-@]+) # listname@ or listname-subq@ + (?P<listname>[^+@]+?) # listname@ or listname-subq@ (non-greedy) (?: # non-grouping - # dash separator - (?P<subq>[^-+@]+) # everything up to + or - or @ + (?P<subq> # any known suffix + admin| + bounces| + confirm| + join| + leave| + owner| + request| + subscribe| + unsubscribe + ) )? # if it exists + [+@] # followed by + or @ """, re.VERBOSE | re.IGNORECASE) |