[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mailman-cvs
Subject:    [Mailman-checkins] [Branch ~mailman-coders/mailman/2.1] Rev 1335:
From:       noreply () launchpad ! net
Date:       2011-12-31 20:44:13
Message-ID: 20111231204413.18143.86434.launchpad () ackee ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 1335
committer: Mark Sapiro <msapiro@value.net>
branch nick: 2.1
timestamp: Sun 2011-12-25 09:25:47 -0800
message:
  Added recognition for another Qmail bounce.
added:
  tests/bounces/qmail_07.txt
modified:
  Mailman/Bouncers/Qmail.py*
  NEWS
  tests/test_bounces.py*


--
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-c=
oders/mailman/2.1/+edit-subscription

["revision-diff.txt" (revision-diff.txt)]

=== modified file 'Mailman/Bouncers/Qmail.py' (properties changed: -x to +x)
--- Mailman/Bouncers/Qmail.py	2009-02-14 22:20:46 +0000
+++ Mailman/Bouncers/Qmail.py	2011-12-25 17:25:47 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 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
@@ -36,7 +36,8 @@
     "We're sorry. There's a problem",
     'Check your send e-mail address.',
     'This is the mail delivery agent at',
-    'Unfortunately, your mail was not delivered'
+    'Unfortunately, your mail was not delivered',
+    'Your mail message to the following',
     ]
 acre = re.compile(r'<(?P<addr>[^>]*)>:')
 

=== modified file 'NEWS'
--- NEWS	2011-12-13 01:31:32 +0000
+++ NEWS	2011-12-25 17:25:47 +0000
@@ -73,6 +73,8 @@
 
   Bug Fixes and other patches
 
+    - Added recognition for another Qmail bounce format.
+
     - Fixed an erroneous seek in the Mailman.Mailbox.Mailbox.AppendMessage
       method that could cause a corrupt mailbox for files opened 'w+'.
       Bug #901957.

=== added file 'tests/bounces/qmail_07.txt'
--- tests/bounces/qmail_07.txt	1970-01-01 00:00:00 +0000
+++ tests/bounces/qmail_07.txt	2011-12-25 17:25:47 +0000
@@ -0,0 +1,25 @@
+From nobody Sat Dec 24 16:02:20 2011
+Return-Path: <>
+X-Original-To: announce-bounces@example.com
+Delivered-To: announce-bounces@example.com
+Received: from p3plsmtp18-06.prod.phx3.secureserver.net
+	(p3plsmtp18-06.prod.phx3.secureserver.net [173.201.193.191])
+	by example.com (Postfix) with ESMTP id 3E97F130D75
+	for <announce-bounces@example.com>;
+	Sat, 24 Dec 2011 16:02:07 -0500 (EST)
+Received: (qmail 1989 invoked for bounce); 24 Dec 2011 21:02:06 -0000
+Date: 24 Dec 2011 21:02:06 -0000
+From: MAILER-DAEMON@p3plsmtp18-06.prod.phx3.secureserver.net
+To: announce-bounces@example.com
+Subject: failure notice
+
+Your mail message to the following address(es) could not be delivered. This
+is a permanent error. Please verify the addresses and try again. If you are
+still having difficulty sending mail to these addresses, please contact
+Customer Support at 480-624-2500.
+
+<user@example.net>:
+child status 100...The e-mail message could not be delivered because the user's mailfolder is full.
+
+--- Below this line is a copy of the message.
+

=== modified file 'tests/test_bounces.py' (properties changed: -x to +x)
--- tests/test_bounces.py	2010-12-22 16:07:37 +0000
+++ tests/test_bounces.py	2011-12-25 17:25:47 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
@@ -135,6 +135,7 @@
         ('Qmail', 'qmail_04.txt', ['merotiia@tennisnsw.com.au']),
         ('Qmail', 'qmail_05.txt', ['ivokggrrdvc@caixaforte.freeservers.com']),
         ('Qmail', 'qmail_06.txt', ['ntl@xxx.com']),
+        ('Qmail', 'qmail_07.txt', ['user@example.net']),
         # LLNL's custom Sendmail
         ('LLNL', 'llnl_01.txt', ['trotts1@llnl.gov']),
         # Netscape's server...



_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/mailman-cvs%40progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]