From d36713a7e57f9a5f366dc7a2d1642aeecf2b500a Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Wed, 23 Jan 2002 21:41:56 +0000
Subject: [PATCH]  . mailgw failures (unexpected ones) are forwarded to the
 roundup admin

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@600 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt       |  1 +
 roundup/mailgw.py | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 822de3f..3968421 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@ Fixed:
  . htmltemplate list() wasn't sorting...
  . allow abbreviation of "help" in admin tool too.
  . run_tests testReldate_date failed if LANG is 'german'
+ . mailgw failures (unexpected ones) are forwarded to the roundup admin
 
 
 2002-01-16 - 0.4.0b2
diff --git a/roundup/mailgw.py b/roundup/mailgw.py
index 6560af2..988b459 100644
--- a/roundup/mailgw.py
+++ b/roundup/mailgw.py
@@ -73,7 +73,7 @@ are calling the create() method to create a new node). If an auditor raises
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.57 2002-01-22 22:27:43 richard Exp $
+$Id: mailgw.py,v 1.58 2002-01-23 21:41:56 richard Exp $
 '''
 
 
@@ -174,8 +174,11 @@ class MailGW:
                 m = self.bounce_message(message, sendto, m)
             except:
                 # bounce the message back to the sender with the error message
-                sendto = [sendto[0][1]]
+                sendto = [sendto[0][1], self.instance.ADMIN_EMAIL]
                 m = ['']
+		m.append('An unexpected error occurred during the processing')
+		m.append('of your message. The tracker administrator is being')
+		m.append('notified.\n')
                 m.append('----  traceback of failure  ----')
                 s = cStringIO.StringIO()
                 import traceback
@@ -754,6 +757,9 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.57  2002/01/22 22:27:43  richard
+#  . handle stripping of "AW:" from subject line
+#
 # Revision 1.56  2002/01/22 11:54:45  rochecompaan
 # Fixed status change in mail gateway.
 #
-- 
2.30.2