------------------------------------------------------------
revno: 1572
fixes bug: https://launchpad.net/bugs/1482940
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Thu 2015-08-13 19:05:52 -0700
message:
Improved fix for LP: 1482940.
modified:
Mailman/Queue/BounceRunner.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Queue/BounceRunner.py'
--- Mailman/Queue/BounceRunner.py 2015-08-09 03:51:59 +0000
+++ Mailman/Queue/BounceRunner.py 2015-08-14 02:05:52 +0000
@@ -30,6 +30,7 @@
from Mailman import Utils
from Mailman import LockFile
from Mailman.Message import UserNotification
+from Mailman.Bouncer import _BounceInfo
from Mailman.Bouncers import BouncerAPI
from Mailman.Queue.Runner import Runner
from Mailman.Queue.sbcache import get_switchboard
@@ -152,16 +153,17 @@
op, addr, bmsg = mlist.pend_confirm(token)
info = mlist.getBounceInfo(addr)
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()
+ # info was deleted before probe bounce was received.
+ # Just create a new info.
+ info = _BounceInfo(addr,
+ 0.0,
+ time.localtime()[:3],
+ mlist.bounce_you_are_disabled_warnings
+ )
+ 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()
=== modified file 'NEWS'
--- NEWS 2015-08-09 03:51:59 +0000
+++ NEWS 2015-08-14 02:05:52 +0000
@@ -15,8 +15,7 @@
Bug fixes and other patches
- Fixed a bug where a delayed probe bounce can throw an AttributeError.
- Now this will be logged and the probe bounce forwarded to the list
- admin if bounce_unrecognized_goes_to_list_owner is Yes. (LP: #1482940)
+ (LP: #1482940)
- If a list is not digestable an the user is not currently set to
receive digests, the digest options will not be shown on the user's
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
