aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2009-02-16 08:53:20 -0800
committerMark Sapiro <mark@msapiro.net>2009-02-16 08:53:20 -0800
commit26adff56b162aa0ee4ad194476c5f754b745291d (patch)
tree3228a80808963b3fe741b8be51b884faa5dc100e
parentc08c323c8a2890f5d28505f6fce3d41244524da2 (diff)
downloadmailman2-26adff56b162aa0ee4ad194476c5f754b745291d.tar.gz
mailman2-26adff56b162aa0ee4ad194476c5f754b745291d.tar.xz
mailman2-26adff56b162aa0ee4ad194476c5f754b745291d.zip
Fixed a bug introduced in 2.1.11 which would attempt to store bounce info
for a member just deleted if bounce_you_are_disabled_warnings is zero.
-rw-r--r--Mailman/Bouncer.py8
-rw-r--r--NEWS3
2 files changed, 8 insertions, 3 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 07e33e48..0ad873e7 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 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
@@ -163,8 +163,10 @@ class Bouncer:
# We've set/changed bounce info above. We now need to tell the
# MemberAdaptor to set/update it. We do it here in case the
# MemberAdaptor stores bounce info externally to the list object to
- # be sure updated information is stored.
- self.setBounceInfo(member, info)
+ # be sure updated information is stored, but we have to be sure the
+ # member wasn't removed.
+ if self.isMember(member):
+ self.setBounceInfo(member, info)
def disableBouncingMember(self, member, info, msg):
# Initialize their confirmation cookie. If we do it when we get the
diff --git a/NEWS b/NEWS
index 182c4540..a28bee04 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,9 @@ Here is a history of user visible changes to Mailman.
- Recognize a couple more bounces.
+ - Fixed a bug introduced in 2.1.11 which would attempt to store bounce info
+ for a member just deleted if bounce_you_are_disabled_warnings is zero.
+
i18n
- Updated Dutch, Catalan and Polish translations.