aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2014-04-26 21:25:34 -0700
committerMark Sapiro <mark@msapiro.net>2014-04-26 21:25:34 -0700
commit9176fd76c6a3f87152ce86f9d45189e7d7cc3333 (patch)
tree15999d8fa8bcd1ddb9fbc3aa30c94675c0ed0d24
parentddbf9c2e7678bf19e05710ab25e47f3f6fe61de8 (diff)
downloadmailman2-9176fd76c6a3f87152ce86f9d45189e7d7cc3333.tar.gz
mailman2-9176fd76c6a3f87152ce86f9d45189e7d7cc3333.tar.xz
mailman2-9176fd76c6a3f87152ce86f9d45189e7d7cc3333.zip
Most Mailman generated notices to list owners and moderators are now
sent as Precedence: list instead of bulk. (LP: #1313146)
-rw-r--r--Mailman/Message.py15
-rwxr-xr-xNEWS7
2 files changed, 20 insertions, 2 deletions
diff --git a/Mailman/Message.py b/Mailman/Message.py
index 24c15a84..5d68e7ef 100644
--- a/Mailman/Message.py
+++ b/Mailman/Message.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2012 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
@@ -284,8 +284,13 @@ class UserNotification(Message):
# UserNotifications are typically for admin messages, and for messages
# other than list explosions. Send these out as Precedence: bulk, but
# don't override an existing Precedence: header.
+ # Also, if the message is To: the list-owner address, set Precedence:
+ # list. See note below in OwnerNotification.
if not (self.has_key('precedence') or noprecedence):
- self['Precedence'] = 'bulk'
+ if self.get('to') == mlist.GetOwnerEmail():
+ self['Precedence'] = 'list'
+ else:
+ self['Precedence'] = 'bulk'
self._enqueue(mlist, **_kws)
def _enqueue(self, mlist, **_kws):
@@ -318,6 +323,12 @@ class OwnerNotification(UserNotification):
del self['to']
self['To'] = mlist.GetOwnerEmail()
self._sender = sender
+ # User notifications are normally sent with Precedence: bulk. This
+ # is appropriate as they can be backscatter of rejected spam.
+ # Owner notifications are not backscatter and are perhaps more
+ # important than 'bulk' so give them Precedence: list by default.
+ # (LP: #1313146)
+ self['Precedence'] = 'list'
def _enqueue(self, mlist, **_kws):
# Not imported at module scope to avoid import loop
diff --git a/NEWS b/NEWS
index d8a1822f..21d8000d 100755
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
+2.1.18 (xx-xxx-xxxx)
+
+ Bug fixes and other patches
+
+ - Most Mailman generated notices to list owners and moderators are now
+ sent as Precedence: list instead of bulk. (LP: #1313146)
+
2.1.18rc3 (25-Apr-2014)
Bug fixes and other patches