Changeset 360

Timestamp:

05/20/10 08:52:13 (14 years ago)

Author:

bas

Message:

Added an extra option ticket_update_by_subject_lookback in combo with
ticket_update_by_subject. Default value is 30 days, see #188

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -22 +22 @@
   * Added a new option. It is all in the name:
       * ticket_update_by_subject, default value is off
+      * ticket_update_by_subject_lookback, default 30 days
 
     When this option is enabled and there is no ticket number found
@@ -29 +30 @@
     Author: Konstantin Ryabitsev <icon add mricon dot com> & Bas van der Vlies
     Applied by: Bas van der Vlies
-    
+
+  * Added DiscussionPlugin support, closes 197. For description see:
+     - https://trac-hacks.org/wiki/DiscussionPlugin
+
+   Author: ibarton add fit dot vutbr dot cz (alias Blackhex)
+   Applied by with some modification: Bas van der Vlies
+
 2010-03-20
 

trunk/debian/changelog

@@ -1 @@
-email2trac (1.4.0-1) stable; urgency=low
+email2trac (1.4.0-2) stable; urgency=low
 
   * See Changelog

trunk/email2trac.py.in

@@ -203 +203 @@
                         self.TICKET_UPDATE_BY_SUBJECT = 0
 
+                if parameters.has_key('ticket_update_by_subject_lookback'):
+                        self.TICKET_UPDATE_BY_SUBJECT_LOOKBACK = int(parameters['ticket_update_by_subject_lookback'])
+                else:
+                        self.TICKET_UPDATE_BY_SUBJECT_LOOKBACK = 30
+
                 if parameters.has_key('drop_spam'):
                         self.DROP_SPAM = int(parameters['drop_spam'])
@@ -919 +924 @@
                                 summaries = [orig_subject, '%%: %s' % orig_subject]
 
-                                # hard-code the time to 30 days for now. Can easily be
-                                # made configurable
-                                lookback = int(time.mktime(time.gmtime())) - 2592000
+                                ##
+                                # Convert days to seconds
+                                lookback = int(time.mktime(time.gmtime())) - \
+                                                self.TICKET_UPDATE_BY_SUBJECT_LOOKBACK * 24 * 3600
+
 
                                 for summary in summaries: