diff options
| author | Mark Sapiro <msapiro@value.net> | 2013-03-28 14:20:32 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2013-03-28 14:20:32 -0700 |
| commit | bd2a529358762ccbc0c1066da06a7c9e5f26da63 (patch) | |
| tree | 527f6a5177ff27429539f9cdd8b7c53a440534de /Mailman | |
| parent | a041ae16b99c9519cadd0f4db90498c9f4788e94 (diff) | |
| download | mailman2-bd2a529358762ccbc0c1066da06a7c9e5f26da63.tar.gz mailman2-bd2a529358762ccbc0c1066da06a7c9e5f26da63.tar.xz mailman2-bd2a529358762ccbc0c1066da06a7c9e5f26da63.zip | |
Fixed a bug where BounceRunner could create and leave behind zero length
bounce-events files. (LP: 1161610)
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Queue/BounceRunner.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index d219d6e9..08ebe859 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -244,6 +244,7 @@ class BounceRunner(Runner, BounceMixin): return # If that still didn't return us any useful addresses, then send it on # or discard it. + addrs = filter(None, addrs) if not addrs: syslog('bounce', '%s: bounce message w/no discernable addresses: %s', @@ -254,7 +255,8 @@ class BounceRunner(Runner, BounceMixin): # BAW: It's possible that there are None's in the list of addresses, # although I'm unsure how that could happen. Possibly ScanMessages() # can let None's sneak through. In any event, this will kill them. - addrs = filter(None, addrs) + # addrs = filter(None, addrs) + # MAS above filter moved up so we don't try to queue an empty list. self._queue_bounces(mlist.internal_name(), addrs, msg) _doperiodic = BounceMixin._doperiodic |