Changeset 363 for trunk

Timestamp:

05/20/10 14:45:20 (14 years ago)

Author:

bas

Message:

Automaticaly determine trac version. There is no need for trac_version in /etc/email2trac.conf

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -1 @@
-2010-XX-XX
+2010-05-20
   * email2trac crashed if there are '/' and '\' characters in a filename.
     These characters are now being replace by '_', closes #196
@@ -36 +36 @@
    Author: ibarton add fit dot vutbr dot cz (alias Blackhex)
    Applied by with some modification: Bas van der Vlies
+
+  * Trac version is now automatically determined. No need anymore for
+    trac_version in /etc/email2trac.conf
+    Author: Bas van der Vlies
 
 2010-03-20

trunk/debian/changelog

@@ +1 @@
+email2trac (1.4.0-3) stable; urgency=low
+
+  * Automatically determine trac version
+
+ -- Bas van der Vlies <basv@sara.nl>  Thu, 20 May 2010 14:43:05 +0200
+
 email2trac (1.4.0-2) stable; urgency=low
 

trunk/email2trac.py.in

@@ -42 +42 @@
     project      : /data/trac/test   # REQUIRED
     debug        : 1                 # OPTIONAL, if set print some DEBUG info
-    trac_version : 0.10              # OPTIONAL, default is 0.11 
 
     [jouvin]                         # OPTIONAL project declaration, if set both fields necessary
@@ -75 +74 @@
 import traceback
 
+from trac import __version__ as trac_version
 
 # Will fail where unavailable, e.g. Windows
@@ -2041 +2041 @@
         settings['dry_run'] = dry_run
         settings['verbose'] = verbose
+
+
+        # Determine major trac version used to be in email2trac.conf
+        #
+        version = '0.%s' %(trac_version.split('.')[1])
+        if verbose:
+                print "Found trac version: %s" %(version)
         
-        if settings.has_key('trac_version'):
-                version = settings['trac_version']
-        else:
-                version = trac_default_version
-
-
         #debug HvB
         #print settings