------------------------------------------------------------
revno: 1329
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Fri 2014-04-25 22:35:21 -0700
message:
The Reply-To: munging options weren't honored if there was no
from_is_list action. (LP: #1313010)
modified:
Mailman/Handlers/WrapMessage.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/WrapMessage.py'
--- Mailman/Handlers/WrapMessage.py 2014-04-24 03:32:05 +0000
+++ Mailman/Handlers/WrapMessage.py 2014-04-26 05:35:21 +0000
@@ -42,18 +42,15 @@
# is wrap this message or from_is_list applies and is wrap.
if not (msgdata.get('from_is_list') == 2 or
(mlist.from_is_list == 2 and msgdata.get('from_is_list') == 0)):
- # Now see if we're munging.
- if msgdata.get('from_is_list') == 1 or (mlist.from_is_list == 1 and
- msgdata.get('from_is_list') == 0):
- # Yes.
- a_h = msgdata.get('add_header')
- if a_h:
- if a_h.get('From'):
- del msg['from']
- msg['From'] = a_h.get('From')
- if a_h.get('Reply-To'):
- del msg['reply-to']
- msg['Reply-To'] = a_h.get('Reply-To')
+ # Now see if we need to add a From: and/or Reply-To: without wrapping.
+ a_h = msgdata.get('add_header')
+ if a_h:
+ if a_h.get('From'):
+ del msg['from']
+ msg['From'] = a_h.get('From')
+ if a_h.get('Reply-To'):
+ del msg['reply-to']
+ msg['Reply-To'] = a_h.get('Reply-To')
return
# There are various headers in msg that we don't want, so we basically
=== modified file 'NEWS'
--- NEWS 2014-04-26 04:06:47 +0000
+++ NEWS 2014-04-26 05:35:21 +0000
@@ -53,6 +53,9 @@
Bug fixes and other patches
+ - The Reply-To: munging options weren't honored if there was no
+ from_is_list action. (LP: #1313010)
+
- Changed from_is_list actions to insert the list address in Cc: if the
list is fully personalized. Otherwise, the list address is only in
From: and Reply-To: overrides it. (LP: #1312970)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
