← Back to branch summary

~xav0989/ubuntu/vivid/mailman/ubuntu-logo

« back to all changes in this revision

Viewing changes to Mailman/Queue/MaildirRunner.py

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2008-04-24 19:30:49 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080424193049-jy5fa9tus40tjbmn
Tags: 1:2.1.10-2
Apply upstream patch to fix regression in cmd_subscribe
so that email subscribe to the -subscribe or -join address or the
-request address with a bare 'subscribe' command results in the message
being shunted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Queue/MaildirRunner.py
1
 
# Copyright (C) 2002 by the Free Software Foundation, Inc.
 
1
# Copyright (C) 2002-2007 by the Free Software Foundation, Inc.
2
2
#
3
3
# This program is free software; you can redistribute it and/or
4
4
# modify it under the terms of the GNU General Public License
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 
16
# USA.
16
17
 
17
18
"""Maildir pre-queue runner.
18
19
 
66
67
# listname-request@
67
68
lre = re.compile(r"""
68
69
 ^                        # start of string
69
 
 (?P<listname>[^-@]+)     # listname@ or listname-subq@
 
70
 (?P<listname>[^+@]+?)    # listname@ or listname-subq@ (non-greedy)
70
71
 (?:                      # non-grouping
71
72
   -                      # dash separator
72
 
   (?P<subq>[^-+@]+)      # everything up to + or - or @
 
73
   (?P<subq>              # any known suffix
 
74
     admin|
 
75
     bounces|
 
76
     confirm|
 
77
     join|
 
78
     leave|
 
79
     owner|
 
80
     request|
 
81
     subscribe|
 
82
     unsubscribe
 
83
   )
73
84
 )?                       # if it exists
 
85
 [+@]                     # followed by + or @
74
86
 """, re.VERBOSE | re.IGNORECASE)
75
87
 
76
88