diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-08-08 20:51:59 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-08-08 20:51:59 -0700 |
| commit | fc381dd41d2d4db6b4e04014a4802befda767fd8 (patch) | |
| tree | 91d3501b1f0e5e851151b99ee39fc22716edd5e0 /Mailman/Queue | |
| parent | 8f2be988de1c3fe4e05fa92ee3ac3f3a92e02dd2 (diff) | |
| download | mailman2-fc381dd41d2d4db6b4e04014a4802befda767fd8.tar.gz mailman2-fc381dd41d2d4db6b4e04014a4802befda767fd8.tar.xz mailman2-fc381dd41d2d4db6b4e04014a4802befda767fd8.zip | |
Fixed bug with delayed probe bounces.
Diffstat (limited to 'Mailman/Queue')
| -rw-r--r-- | Mailman/Queue/BounceRunner.py | 17 |
1 files changed, 12 insertions, 5 deletions
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() |