[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mailman-cvs
Subject:    [Mailman-checkins] [Branch ~mailman-coders/mailman/2.1] Rev 1339: Subscription disabled	warnings are
From:       noreply () launchpad ! net
Date:       2012-02-18 2:23:10
Message-ID: 20120218022310.23368.76150.launchpad () ackee ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 1339
committer: Mark Sapiro <msapiro@value.net>
branch nick: 2.1
timestamp: Fri 2012-02-17 18:18:34 -0800
message:
  Subscription disabled warnings are now sent without a Precedence:
  header.  Bug #808821.
modified:
  Mailman/Bouncer.py
  Mailman/Message.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-c=
oders/mailman/2.1/+edit-subscription

["revision-diff.txt" (revision-diff.txt)]

=== modified file 'Mailman/Bouncer.py'
--- Mailman/Bouncer.py	2010-07-11 18:19:30 +0000
+++ Mailman/Bouncer.py	2012-02-18 02:18:34 +0000
@@ -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 @@
         # 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

=== modified file 'Mailman/Message.py'
--- Mailman/Message.py	2011-01-14 00:53:30 +0000
+++ Mailman/Message.py	2012-02-18 02:18:34 +0000
@@ -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 @@
             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 @@
         # 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)
 

=== modified file 'NEWS'
--- NEWS	2012-02-05 21:37:29 +0000
+++ NEWS	2012-02-18 02:18:34 +0000
@@ -81,6 +81,9 @@
 
   Bug Fixes and other patches
 
+    - Subscription disabled warnings are now sent without a Precedence:
+      header.  Bug #808821.
+
     - Backported 2.2 branch fix for a problem in SpamDetect.py that could
       cause header_filter_rules to fail to match RFC 2047 encoded headers.
 



_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/mailman-cvs%40progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]