aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsapiro <>2006-01-23 21:08:39 +0000
committermsapiro <>2006-01-23 21:08:39 +0000
commit315dfd44fab52456f7430855a2b205f2561ed821 (patch)
treed7128eb71dc67c715ae19d87c524e770af440962
parentbf41c443106f98b0bcfd32ab9d240deb1c5d2b0f (diff)
downloadmailman2-315dfd44fab52456f7430855a2b205f2561ed821.tar.gz
mailman2-315dfd44fab52456f7430855a2b205f2561ed821.tar.xz
mailman2-315dfd44fab52456f7430855a2b205f2561ed821.zip
Added Microsoft SMTPSVC. 'Improved' pattern for prodigy.net.
-rw-r--r--Mailman/Bouncers/SimpleMatch.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index 16220e87..2fd2557c 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -78,7 +78,11 @@ PATTERNS = [
# Prodigy.net full mailbox
(_c("User's mailbox is full:"),
_c('Unable to deliver mail.'),
- _c("User's mailbox is full:\s*<(?P<addr>.*)>.*$")),
+ _c("User's mailbox is full:\s*<(?P<addr>[^>]*)>")),
+ # Microsoft SMTPSVC
+ (_c('The email below could not be delivered to the following user:'),
+ _c('Old message:'),
+ _c('<(?P<addr>[^>]*)>')),
# Next one goes here...
]