From fc381dd41d2d4db6b4e04014a4802befda767fd8 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sat, 8 Aug 2015 20:51:59 -0700 Subject: Fixed bug with delayed probe bounces. --- Mailman/Queue/BounceRunner.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Mailman') diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index fcd6e3fb..d418ac5d 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2015 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 @@ -151,10 +151,17 @@ class BounceMixin: try: op, addr, bmsg = mlist.pend_confirm(token) info = mlist.getBounceInfo(addr) - mlist.disableBouncingMember(addr, info, bmsg) - # Only save the list if we're unlocking it - if not locked: - mlist.Save() + if not info: + syslog('bounce', + '%s: Probe bounce received for %s with no bounce info', + mlist.internal_name(), + addr) + maybe_forward(mlist, bmsg) + else: + mlist.disableBouncingMember(addr, info, bmsg) + # Only save the list if we're unlocking it + if not locked: + mlist.Save() finally: if not locked: mlist.Unlock() -- cgit v1.2.3