diff options
| author | Jim Popovitch <jimpop@gmail.com> | 2013-11-17 01:56:29 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@gmail.com> | 2013-11-17 01:56:29 +0000 |
| commit | 06d15b0a9949652f696d19903cef2a235ff3a428 (patch) | |
| tree | 55a9c12de799cc056da986aafe3b8e66d0cbf94b /contrib/qmail-to-mailman.py | |
| parent | bc05ad4e81bd2ce9ec0f36e5112eadf607a49195 (diff) | |
| parent | ded18dda2b2f9ba00f8780b4eba6c398c5bff838 (diff) | |
| download | mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.tar.gz mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.tar.xz mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.zip | |
Upstream changes
Diffstat (limited to '')
| -rw-r--r-- | contrib/qmail-to-mailman.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/qmail-to-mailman.py b/contrib/qmail-to-mailman.py index 3e4e19d5..8c95a1d3 100644 --- a/contrib/qmail-to-mailman.py +++ b/contrib/qmail-to-mailman.py @@ -64,7 +64,8 @@ def main(): sys.exit(100) local = string.lower(local) - local = re.sub("^mailman-","",local) + user = os.environ.get('USER', 'mailman') + local = re.sub('^%s-' % user, '', local) names = ("root", "postmaster", "mailer-daemon", "mailman-owner", "owner", "abuse") @@ -77,10 +78,15 @@ def main(): type = "post" types = (("-admin$", "bounces"), ("-bounces$", "bounces"), + ("-bounces[-+].*$", "bounces"), + ("-confirm$", "confirm"), + ("-confirm[-+].*$", "confirm"), ("-join$", "join"), ("-leave$", "leave"), ("-owner$", "owner"), - ("-request$", "request")) + ("-request$", "request"), + ("-subscribe$", "subscribe"), + ("-unsubscribe$", "unsubscribe")) for i in types: if re.search(i[0],local): |