------------------------------------------------------------
revno: 1864
fixes bug: https://launchpad.net/bugs/1915655
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Sun 2021-02-14 19:36:36 -0800
message:
Fix missing Subject: in some Wrap Message wrappers.
modified:
Mailman/Handlers/WrapMessage.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Handlers/WrapMessage.py'
--- Mailman/Handlers/WrapMessage.py 2018-06-17 23:47:34 +0000
+++ Mailman/Handlers/WrapMessage.py 2021-02-15 03:36:36 +0000
@@ -63,13 +63,19 @@
# make a copy of the msg, then delete almost everything and set/copy
# what we want.
omsg = copy.deepcopy(msg)
+ # If CookHeaders didn't change the Subject: we need to keep it too.
+ # Get a fresh list.
+ keepers = list(KEEPERS)
+ if 'subject' not in [key.lower() for key in
+ msgdata.get('add_header', {}).keys()]:
+ keepers.append('subject')
for key in msg.keys():
- if key.lower() not in KEEPERS:
+ if key.lower() not in keepers:
del msg[key]
msg['MIME-Version'] = '1.0'
msg['Message-ID'] = Utils.unique_message_id(mlist)
# Add the headers from CookHeaders.
- for k, v in msgdata['add_header'].items():
+ for k, v in msgdata.get('add_header', {}).items():
msg[k] = v
# Are we including dmarc_wrapped_message_text? I.e., do we have text and
# are we wrapping because of dmarc_moderation_action?
=== modified file 'NEWS'
--- NEWS 2020-07-03 00:48:27 +0000
+++ NEWS 2021-02-15 03:36:36 +0000
@@ -5,6 +5,13 @@
Here is a history of user visible changes to Mailman.
+2.1.35 (xx-xxx-xxxx)
+
+ Bug Fixes and other patches
+
+ - Fixed an issue where sometimes the wrapper message for DMARC mitigation
+ Wrap Message has no Subject:. (LP: #1915655)
+
2.1.34 (26-Jun-2020)
i18n
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
