------------------------------------------------------------
revno: 1039
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Mon 2009-02-16 08:55:47 -0800
message:
Merged change from 2.1 branch.
modified:
Mailman/Bouncer.py
NEWS
------------------------------------------------------------
revno: 984.1.192
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Mon 2009-02-16 08:53:20 -0800
message:
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.
modified:
Mailman/Bouncer.py
NEWS
=== modified file 'Mailman/Bouncer.py'
--- Mailman/Bouncer.py 2008-06-20 19:47:28 +0000
+++ Mailman/Bouncer.py 2009-02-16 16:53:20 +0000
@@ -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 @@
# 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
=== modified file 'NEWS'
--- NEWS 2009-02-14 22:28:23 +0000
+++ NEWS 2009-02-16 16:55:47 +0000
@@ -141,6 +141,9 @@
- 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.
--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
