diff options
| author | Mark Sapiro <msapiro@value.net> | 2012-02-17 18:18:34 -0800 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2012-02-17 18:18:34 -0800 |
| commit | ce7998b41a4d3980a0d4ac23207ad286678e1c95 (patch) | |
| tree | 26937511260dba043ce522a6a7405824f1011dbc /Mailman | |
| parent | 3d6e6f1d79d14e4aa2fb0d044949787ad818bc25 (diff) | |
| download | mailman2-ce7998b41a4d3980a0d4ac23207ad286678e1c95.tar.gz mailman2-ce7998b41a4d3980a0d4ac23207ad286678e1c95.tar.xz mailman2-ce7998b41a4d3980a0d4ac23207ad286678e1c95.zip | |
Subscription disabled warnings are now sent without a Precedence:
header. Bug #808821.
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Bouncer.py | 5 | ||||
| -rw-r--r-- | Mailman/Message.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index 036b58a0..29fe4ea5 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2010 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2012 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 @@ -307,7 +307,8 @@ class Bouncer: # set the Subject this way. del msg['subject'] msg['Subject'] = 'confirm ' + info.cookie - msg.send(self) + # Send without Precedence: bulk. Bug #808821. + msg.send(self, noprecedence=True) info.noticesleft -= 1 info.lastnotice = time.localtime()[:3] # In case the MemberAdaptor stores bounce info externally to diff --git a/Mailman/Message.py b/Mailman/Message.py index 3bbb9ecc..24c15a84 100644 --- a/Mailman/Message.py +++ b/Mailman/Message.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2012 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 @@ -268,7 +268,7 @@ class UserNotification(Message): self['To'] = recip self.recips = [recip] - def send(self, mlist, **_kws): + def send(self, mlist, noprecedence=False, **_kws): """Sends the message by enqueuing it to the `virgin' queue. This is used for all internally crafted messages. @@ -284,7 +284,7 @@ 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. - if not self.has_key('precedence'): + if not (self.has_key('precedence') or noprecedence): self['Precedence'] = 'bulk' self._enqueue(mlist, **_kws) |