Ticket #192: strip-on-update-only.patch

email2trac.py.in

@@ -786 +786 @@
                 if update_fields:
                         self.update_ticket_fields(tkt, update_fields)
 
-                message_parts = self.get_message_parts(m)
+                message_parts = self.get_message_parts(m, is_update=1)
                 message_parts = self.unique_attachment_names(message_parts)
 
                 # Must we update some ticket fields properties via body_text
@@ -1338 +1338 @@
 
                 return part.get_param('inline', None, 'Content-Disposition') == '' or not part.has_key('Content-Disposition')
 
-        def get_message_parts(self, msg):
+        def get_message_parts(self, msg, is_update=0):
                 """
                 parses the email message and returns a list of body parts and attachments
                 body parts are returned as strings, attachments are returned as tuples of (filename, Message object)
@@ -1408 +1408 @@
 
                                 if self.REFLOW and not self.VERBATIM_FORMAT and format == 'flowed':
                                         body_text = self.reflow(body_text, delsp == 'yes')
-        
-                                if self.STRIP_SIGNATURE:
-                                        body_text = self.strip_signature(body_text)
 
-                                if self.STRIP_QUOTES: 
-                                        body_text = self.strip_quotes(body_text)
+                                if is_update:
+                                        if self.STRIP_SIGNATURE:
+                                                body_text = self.strip_signature(body_text)
+                                                if self.DEBUG:
+                                                        print 'TD:               Update, stripped signature'
+
+                                        if self.STRIP_QUOTES: 
+                                                body_text = self.strip_quotes(body_text)
+                                                if self.DEBUG:
+                                                        print 'TD:               Update, stripped quotes'
 
                                 if self.INLINE_PROPERTIES: 
                                         body_text = self.inline_properties(body_text)