From 4cbc8a3a640d39a67a24647656ac14671d3b7b88 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Fri, 20 Jun 2008 16:21:29 -0700
Subject: More bounce recognition improvements.
---
Mailman/Bouncers/SimpleMatch.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'Mailman/Bouncers')
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index 068dc45c..bd7124b6 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -88,7 +88,7 @@ PATTERNS = [
_c('--- Original message follows\.'),
_c('<(?P<addr>[^>]*)>:')),
# googlemail.com
- (_c('Delivery to the following recipient failed'),
+ (_c('Delivery to the following recipient(s)? failed'),
_c('----- Original message -----'),
_c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
# kundenserver.de, mxlogic.net
@@ -99,13 +99,13 @@ PATTERNS = [
(_c('A message that you( have)? sent could not be delivered'),
_c('^---'),
_c('^(?P<addr>[^\s@]+@[^\s@:]+):')),
- # thehartford.com
- (_c('Delivery to the following recipients failed'),
+ # thehartford.com and amenworld.com
+ (_c('Del(i|e)very to the following recipient(s)? (failed|was aborted)'),
# this one may or may not have the original message, but there's nothing
# unique to stop on, so stop on the first line of at least 3 characters
# that doesn't start with 'D' (to not stop immediately) and has no '@'.
_c('^[^D][^@]{2,}$'),
- _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
+ _c('^\s*(. )?(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
# and another thehartfod.com/hartfordlife.com
(_c('^Your message\s*$'),
_c('^because:'),
--
cgit v1.2.3