Changeset 129

Timestamp:

10/20/06 13:12:16 (18 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• See Changelog

Location:

emailtotracscript/trunk

Files:

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

emailtotracscript/trunk/ChangeLog

@@ -1 +1 @@
 2006-xxxx
-        * Fixed an error if enable_syslog and drop_spam is set. We get
+
+        * run_email2trac.c. 
+        
+          - Setgid() must be called before setuid().
+          Reported by:  Anonymous
+          Fixed    by:  Bas van der Vlies
+
+        * email2trac.py, 
+        
+          - Fixed an error in Ticket Update. When ticket
+          does not exists, proceed as if it is a new ticket
+          Fixed    by:  Bas van der Vlies
+
+          - Fixed a strang bug in 0.9 version, if ticket update 
+          is enabled and email has attachment(s). We are not allowed to 
+          set the description and author field of the attachment else 
+          the comment text is lost ;-(
+          Fixed    by:  Bas van der Vlies
+
+          - Fixed an error if enable_syslog and drop_spam is set. We get
           an exception in the syslog if we use sys.exit(0), replaced by
           return.
           Fixed    by:  Bas van der Vlies
 
-        * run_email2trac.c. Setgid() must be called before setuid().
-          Reported by:  Anonymous
-          Fixed    by:  Bas van der Vlies
-
-        * email2trac.py, Fixed an error in Ticket Update. When ticket
-          does not exists, proceed as if it is a new ticket
-          Fixed    by:  Bas van der Vlies
-
-        * delete_spam.py. Trac version 0.10 made it easier to delete 
-          tickets.
+        * delete_spam.py. 
+        
+          - Trac version 0.10 made it easier to delete tickets.
           Fixed    by:  Bas van der Vlies
         

emailtotracscript/trunk/debian/changelog

@@ +1 @@
+email2trac (0.8.1-6) stable; urgency=low
+
+  * Fixed a strang bug in 0.9 version, if ticket update and email has
+    attachment we are not allowed to set the description and author
+    field of the attachment else the comment text is lost
+
+ -- root <root@rc.sara.nl>  Fri, 20 Oct 2006 13:06:28 +0200
+
 email2trac (0.8.1-5) stable; urgency=low
 

emailtotracscript/trunk/email2trac.py.in

@@ -380 +380 @@
                         tkt['id'] = ticket_id
 
-                self.attachments(m, tkt)
+                if self.VERSION  == 0.9:
+                        self.attachments(m, tkt, True)
+                else:
+                        self.attachments(m, tkt)
 
                 if self.notification:
@@ -612 +615 @@
                 return str
 
-        def attachments(self, message, ticket):
+        def attachments(self, message, ticket, update=False):
                 '''
                 save any attachments as files in the ticket's directory
@@ -698 +701 @@
                                 fd = open(path)
                                 att = attachment.Attachment(self.env, 'ticket', ticket['id'])
-                                att.author = self.author
-                                att.description = 'Added by email2trac'
+
+                                # This will break the ticket_update system, the body_text is vaporized
+                                # ;-(
+                                #
+                                if not update:
+                                        att.author = self.author
+                                        att.description = self.to_unicode('Added by email2trac')
+
                                 att.insert(url_filename, fd, filesize)
                                 fd.close()