From 8b49009b2ae78b216f6bc9919875e52d0694908a Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Thu, 4 Oct 2007 18:40:13 -0700
Subject: /cygdrive/c/MM_bzr/log.txt

---
 Mailman/Queue/MaildirRunner.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 Mailman/Queue/MaildirRunner.py

(limited to 'Mailman/Queue')

diff --git a/Mailman/Queue/MaildirRunner.py b/Mailman/Queue/MaildirRunner.py
old mode 100644
new mode 100755
index 39971ae2..d9fe02cb
--- 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)
 
 
-- 
cgit v1.2.3