Changeset 300 for trunk/email2trac.py.in

Timestamp:

01/11/10 13:45:41 (14 years ago)

Author:

bas

Message:

a better patch for handling mail loop in set_reply and cc-field, depends on smtp_from setting in trac.ini, see #172

File:

• trunk/email2trac.py.in (modified) (2 diffs)

trunk/email2trac.py.in

@@ -486 +486 @@
                         ## Build a list of forbidden CC addresses
                         #
-                        to_addrs = email.Utils.getaddresses( message.get_all('to', []) )
-                        to_list = list()
-                        for n,e in to_addrs:
-                                to_list.append(e)
+                        #to_addrs = email.Utils.getaddresses( message.get_all('to', []) )
+                        #to_list = list()
+                        #for n,e in to_addrs:
+                        #       to_list.append(e)
                                 
                         # Remove reporter email address if notification is 
@@ -500 +500 @@
                                         pass
 
+                        ## This address is forbidden for CC-field, cuases mail-loop
+                        #
+                        smtp_from = self.get_config('notification', 'smtp_from')
+
                         for name,addr in cc_addrs:
                 
                                 ## Prevent mail loop
                                 #
-                                if addr in to_list:
+                                #if addr in to_list:
+                                if addr == smtp_from:
                                         if self.DEBUG:
                                                 print "Skipping %s mail address for CC-field" %(addr)