diff options
| author | Mark Sapiro <mark@msapiro.net> | 2008-06-20 16:20:18 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2008-06-20 16:20:18 -0700 |
| commit | 04cff960b15dd31ce6200abdff6fc57df2526146 (patch) | |
| tree | ad66f7a4b5e5e7104905549b9610c05489302adc /Mailman | |
| parent | fb79444a20297f9a98c1e515527de757e00cda56 (diff) | |
| download | mailman2-04cff960b15dd31ce6200abdff6fc57df2526146.tar.gz mailman2-04cff960b15dd31ce6200abdff6fc57df2526146.tar.xz mailman2-04cff960b15dd31ce6200abdff6fc57df2526146.zip | |
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.
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/OldStyleMemberships.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/OldStyleMemberships.py b/Mailman/OldStyleMemberships.py index f28c08db..d50bc62f 100644 --- a/Mailman/OldStyleMemberships.py +++ b/Mailman/OldStyleMemberships.py @@ -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 @@ class OldStyleMemberships(MemberAdaptor.MemberAdaptor): 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: |