Changeset 390

Timestamp:

07/06/10 14:02:55 (13 years ago)

Author:

bas

Message:

Fixed several errors for a ticket update

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2010-07-06
+  * Fixed several errors in ticket update: 
+     - Changed the regex expression. It must end with ':'.    
+     - The email was lost if the ticket id was unknown. If ticket
+       id is unknown a new ticket will be created.
+
+    Reported by: SARA grid team
+    Fixed by: Bas van der Vlies
+       
+
+
 2010-06-28
   * Ticket update for version 0.12 did not work, closes #209

trunk/debian/changelog

@@ +1 @@
+email2trac (1.4.8-1) stable; urgency=low
+
+  * Fixed several errors in ticket update: 
+     - Changed the regex expression. It must end with ':'.
+     - The email was lost if the ticket id was unknown. If ticket
+       id is unknown a new ticket will be created.
+
+    Reported by: SARA grid team
+    Fixed by: Bas van der Vlies
+       
+ -- Bas van der Vlies <basv@sara.nl>  Tue, 06 Jul 2010 13:55:43 +0200
+
 email2trac (1.4.7-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -746 +746 @@
                         id, keywords = string.split(id, '?')
 
-                        # Skip the last ':' character
-                        #
-                        keywords = keywords[:-1]
                         update_fields = self.str_to_dict(keywords)
 
@@ -756 +753 @@
 
                 except ValueError:
+
                         # Strip '#' 
                         #
@@ -774 +772 @@
                 try:
                         tkt = Ticket(self.env, self.id, self.db)
+
                 except util.TracError, detail:
+
                         # Not a valid ticket
+
                         self.id = None
                         return False
@@ -1467 +1468 @@
                 ticket_regex = r'''
                         (?P<new_fields>[#][?].*)
-                        |(?P<reply>(?P<id>[#][\d]+)(?P<fields>\?.*?:)*)
+                        |(?P<reply>(?P<id>[#][\d]+)(?P<fields>\?.*)?:)
                         '''
                 # Check if  FullBlogPlugin is installed
@@ -1497 +1498 @@
                 #
                 result =  SYSTEM_RE.search(subject)
+
                 if result:
                         # update ticket + fields
@@ -1502 +1504 @@
                         if result.group('reply') and self.TICKET_UPDATE:
                                 self.system = 'ticket'
-                                self.ticket_update(m, result.group('reply'), spam_msg)
+
+                                # Skip the last ':' character
+                                #
+                                if not self.ticket_update(m, result.group('reply')[:-1], spam_msg):
+                                        self.new_ticket(m, subject, spam_msg)
 
                         # New ticket + fields
@@ -1541 +1547 @@
                         result = self.ticket_update_by_subject(subject)
                         if result:
-                                self.ticket_update(m, result, spam_msg)
+                                if not self.ticket_update(m, result, spam_msg):
+                                        self.new_ticket(m, subject, spam_msg)
                         else:
                                 # No update by subject, so just create a new ticket

trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 1.4.7
+Version: 1.4.8
 Release: 1
 License: GPL