Changeset 615

Timestamp:

10/01/12 10:49:10 (11 years ago)

Author:

bas

Message:

Improved code for detecting which trac version is installed

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -1 @@
-2.X.X
+2.6.2
   * Removed '--Orignal message---' from strip_signature_regex. It is not a 
     signature but a quote. Thanks to Walter Lioen (SARA)
@@ -5 +5 @@
 
   * Added support fot trac 1.0, closes #302, #303
+    Reported by: thomas dot schabetsberger add webtek dot at
+    Fixed by: Bas van der Vlies
 
 2.6.0 (Dedicated to Ian Verhey (RIP) )

trunk/email2trac.py.in

@@ -2635 +2635 @@
         settings['component'] = component
 
-    ## Determine major trac version used to be in email2trac.conf
-    # Quick hack for 0.12
+    ## We are only interested in the major versions
+    # 0.12.3 --> 0.12
+    # 1.0.2  --> 1.0
     #
-    version = '0.%s' %(trac_version.split('.')[1])
-    if version.startswith('0.12'):
-        version = '0.12'
-    elif version.startswith('0.13'):
-        version = '0.13'
-    elif trac_version.startswith("1.0"):
-        version = '1.0'
+    l = trac_version.split('.')
+    version = '.'.join(l[0:2])
 
     logger.debug("Found trac version: %s" %(version))