------------------------------------------------------------
revno: 1103
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2008-06-20 16:20:18 -0700
message:
  Changed OldStyleMemberships.py to remove the member from one_last_digest
  when changing from regular to digest delivery to avoid the possibility
  of a duplicate digest in some circumstances.
modified:
  Mailman/OldStyleMemberships.py
  NEWS

=== modified file 'Mailman/OldStyleMemberships.py'
--- a/Mailman/OldStyleMemberships.py    2007-03-20 23:12:18 +0000
+++ b/Mailman/OldStyleMemberships.py    2008-06-20 23:20:18 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2008 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
@@ -292,6 +292,12 @@
                     raise Errors.NotAMemberError, member
                 del self.__mlist.members[memberkey]
                 self.__mlist.digest_members[memberkey] = cpuser
+                # If we recently turned off digest mode and are now
+                # turning it back on, the member may be in one_last_digest.
+                # If so, remove it so the member doesn't get a dup of the
+                # next digest.
+                if self.__mlist.one_last_digest.has_key(memberkey):
+                    del self.__mlist.one_last_digest[memberkey]
             else:
                 # Be sure the list supports regular delivery
                 if not self.__mlist.nondigestable:

=== modified file 'NEWS'
--- a/NEWS      2008-06-20 19:49:24 +0000
+++ b/NEWS      2008-06-20 23:20:18 +0000
@@ -70,6 +70,10 @@
     - Fixed CookHeaders.py which in some cases with new style prefixing
       would insert an extra space between the prefix and the subject.
 
+    - Changed OldStyleMemberships.py to remove the member from one_last_digest
+      when changing from regular to digest delivery to avoid the possibility
+      of a duplicate digest in some circumstances.
+
   Miscellaneous
 
     - Brad Knowles' mailman daily status report script updated to 0.0.18.



--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1

You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to