------------------------------------------------------------
revno: 1290
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Fri 2013-11-01 09:53:50 -0700
message:
  Fixed contrib/qmail-to-mailman.py to work with a user other than
  'mailman' and to recognize more listname-* addresses.  (LP: #412293)
modified:
  NEWS
  contrib/qmail-to-mailman.py


--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'NEWS'
--- NEWS	2013-10-29 20:26:56 +0000
+++ NEWS	2013-11-01 16:53:50 +0000
@@ -63,6 +63,9 @@
 
   Bug Fixes and other patches
 
+    - Fixed contrib/qmail-to-mailman.py to work with a user other than
+      'mailman' and to recognize more listname-* addresses.  (LP: #412293)
+
     - Fixed a possible UnicodeDecodeError in bin/sync_members.  (LP: #1243343)
 
     - Fixed Makefile to not include $DESTDIR in paths compiled into .pyc

=== modified file 'contrib/qmail-to-mailman.py'
--- contrib/qmail-to-mailman.py	2003-02-08 07:14:13 +0000
+++ contrib/qmail-to-mailman.py	2013-11-01 16:53:50 +0000
@@ -64,7 +64,8 @@
         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 @@
     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):

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to