------------------------------------------------------------
revno: 1305
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Sun 2014-02-16 15:03:06 -0800
message:
  - The from_is_list header munging feature introduced in Mailman 2.1.16 is
    no longer erroneously applied to Mailman generated notices.
modified:
  Mailman/Handlers/CookHeaders.py
  NEWS


--
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 'Mailman/Handlers/CookHeaders.py'
--- Mailman/Handlers/CookHeaders.py	2013-09-28 23:07:16 +0000
+++ Mailman/Handlers/CookHeaders.py	2014-02-16 23:03:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 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
@@ -65,7 +65,10 @@
     return Header(s, charset, maxlinelen, header_name, continuation_ws)
 
 def change_header(name, value, mlist, msg, msgdata, delete=True, repl=True):
-    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list == 2:
+    if (mm_cfg.ALLOW_FROM_IS_LIST and
+        mlist.from_is_list == 2 and
+        not msgdata.get('_fasttrack')
+       ):
         msgdata.setdefault('add_header', {})[name] = value
     elif repl or not msg.has_key(name):
         if delete:
@@ -116,7 +119,7 @@
     change_header('Precedence', 'list',
                   mlist, msg, msgdata, repl=False)
     # Do we change the from so the list takes ownership of the email
-    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list:
+    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list and not fasttrack:
         realname, email = parseaddr(msg['from'])
         replies = getaddresses(msg.get('reply-to', ''))
         reply_addrs = [x[1].lower() for x in replies]

=== modified file 'NEWS'
--- NEWS	2014-02-07 23:37:04 +0000
+++ NEWS	2014-02-16 23:03:06 +0000
@@ -58,6 +58,10 @@
 
   Bug Fixes and other patches
 
+    - The from_is_list header munging feature introduced in Mailman 2.1.16 is
+      no longer erroneously applied to Mailman generated notices.
+      (LP: #1279667)
+
     - Changed the message from the confirm CGI to not indicate approval is
       required for an acceptance of an invitation.  (LP: #1277744)
 

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

Reply via email to