Changeset 213

Timestamp:

07/11/08 16:55:28 (15 years ago)

Author:

bas

Message:

email2trac.py.in:

• fixed some formating problems with trac version 0.11

debian/control:

• Removed trac from depend statement. Trac 0.11 is distributed as egg

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• email2trac.py.in (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-XX-XX
+  * Fixed a bug in email_header formating. When an email2trac ticket 
+    was updated via the web interface it would trigger a description 
+    field update.
+
+    Fixed by: Bas van der Vlies
+
 2008-05-30
   * Fixed debian control file. Package can be build on any platform and

trunk/debian/changelog

@@ +1 @@
+email2trac (0.30-2) stable; urgency=low
+
+  *  Fixed an error in formating email_header.
+
+ -- Bas van der Vlies <basv@sara.nl>  Thu, 03 Jul 2008 12:53:39 +0200
+
 email2trac (0.30-1) stable; urgency=low
 

trunk/debian/control

@@ -10 +10 @@
 Architecture: any
 Maintainer: Bas van der Vlies <bas@sara.nl>
-Depends: ${slibs:Depends}, python, cdbs, trac
+Depends: ${slibs:Depends}, python, cdbs
 Description: Converts email to a trac ticket
         Name says it All

trunk/email2trac.py.in

@@ -377 +377 @@
                 """
                 str = ''
-                if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
-                        str = "'''To:''' %s [[BR]]" %(m['To'])
+                #if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
+                if m['To'] and len(m['To']) > 0:
+                        str = "'''To:''' %s\r\n" %(m['To'])
                 if m['Cc'] and len(m['Cc']) > 0:
-                        str = "%s'''Cc:''' %s [[BR]]" % (str, m['Cc'])
+                        str = "%s'''Cc:''' %s\r\n" % (str, m['Cc'])
 
                 return  self.email_to_unicode(str)
@@ -620 +621 @@
                 if self.EMAIL_HEADER:
                         head = self.email_header_txt(m)
-                        body_text = u"\r\n%s \r\n%s" %(head, body_text)
+                        body_text = u"%s\r\n%s" %(head, body_text)
 
                 tkt.save_changes(self.author, body_text, when)
@@ -716 +717 @@
                 body_text = self.get_body_text(msg)
 
-                tkt['description'] = '\r\n%s\r\n%s' \
+                tkt['description'] = '%s\r\n%s' \
                         %(head, body_text)
 
@@ -741 +742 @@
                         #mailto = self.html_mailto_link(tkt['summary'], ticket_id, body_text)
                         mailto = self.html_mailto_link( m['Subject'], ticket_id, body_text)
-                        tkt['description'] = u'\r\n%s\r\n%s%s\r\n' \
+                        tkt['description'] = u'%s\r\n%s%s\r\n' \
                                 %(head, mailto, body_text)
 
@@ -944 +945 @@
 
                         tn = TicketNotifyEmail(self.env)
+
                         if self.notify_template:
                                 tn.template_name = self.notify_template;
@@ -973 +975 @@
                            )
 
-                str = '\r\n{{{\r\n#!html\r\n<a href="%s">Reply to: %s</a>\r\n}}}\r\n' %(str, author)
+                str = '\r\n{{{\r\n#!html\r\n<a\r\n href="%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(str, author)
                 return str