Changeset 373

Timestamp:

06/09/10 17:12:51 (13 years ago)

Author:

bas

Message:

Some minor code re-arrangements to determine trac version

Location:

trunk

Files:

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

trunk/delete_spam.py.in

@@ -148 +148 @@
                         VERBOSE = True
 
-        ## trac version is defined like this  X.version.X
+        # Determine major trac version used to be in email2trac.conf
+        # Quick hack for 0.12
         #
-        version = int(trac_version.split('.')[1])
+        version = '0.%s' %(trac_version.split('.')[1])
+        if version.startswith('0.12'):
+                version = '0.12'
+
         if VERBOSE:
                 print "Found trac version: %d" %version
 
-        if version < 10:
+        ## We only support versions 0.11 and 0.12
+        #
+        if not version in ['0.11', '0.12']:
                 print 'Trac version %s is not suported' %(version)
-        
+
         settings = ReadConfig(configfile, project_name)
         if not settings.has_key('project'):

trunk/email2trac.py.in

@@ -2044 +2044 @@
 
         # Determine major trac version used to be in email2trac.conf
+        # Quick hack for 0.12
         #
         version = '0.%s' %(trac_version.split('.')[1])
+        if version.startswith('0.12'):
+                version = '0.12'
+
         if verbose:
                 print "Found trac version: %s" %(version)
@@ -2051 +2055 @@
         #debug HvB
         #print settings
-
-        # Quick hack for 0.12
-        #
-        if version.startswith('0.12'):
-                version = '0.12'
-                if verbose:
-                        print "Found trac version: %s" %(version)
 
         try: