Changeset 390 for trunk/email2trac.py.in
- Timestamp:
- 07/06/10 14:02:55 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r388 r390 746 746 id, keywords = string.split(id, '?') 747 747 748 # Skip the last ':' character749 #750 keywords = keywords[:-1]751 748 update_fields = self.str_to_dict(keywords) 752 749 … … 756 753 757 754 except ValueError: 755 758 756 # Strip '#' 759 757 # … … 774 772 try: 775 773 tkt = Ticket(self.env, self.id, self.db) 774 776 775 except util.TracError, detail: 776 777 777 # Not a valid ticket 778 778 779 self.id = None 779 780 return False … … 1467 1468 ticket_regex = r''' 1468 1469 (?P<new_fields>[#][?].*) 1469 |(?P<reply>(?P<id>[#][\d]+)(?P<fields>\?.* ?:)*)1470 |(?P<reply>(?P<id>[#][\d]+)(?P<fields>\?.*)?:) 1470 1471 ''' 1471 1472 # Check if FullBlogPlugin is installed … … 1497 1498 # 1498 1499 result = SYSTEM_RE.search(subject) 1500 1499 1501 if result: 1500 1502 # update ticket + fields … … 1502 1504 if result.group('reply') and self.TICKET_UPDATE: 1503 1505 self.system = 'ticket' 1504 self.ticket_update(m, result.group('reply'), spam_msg) 1506 1507 # Skip the last ':' character 1508 # 1509 if not self.ticket_update(m, result.group('reply')[:-1], spam_msg): 1510 self.new_ticket(m, subject, spam_msg) 1505 1511 1506 1512 # New ticket + fields … … 1541 1547 result = self.ticket_update_by_subject(subject) 1542 1548 if result: 1543 self.ticket_update(m, result, spam_msg) 1549 if not self.ticket_update(m, result, spam_msg): 1550 self.new_ticket(m, subject, spam_msg) 1544 1551 else: 1545 1552 # No update by subject, so just create a new ticket
Note: See TracChangeset
for help on using the changeset viewer.