Changeset 365

Timestamp:

05/20/10 15:43:47 (13 years ago)

Author:

bas

Message:

delete_spam still used trac_version in /etc/email2trac.conf. Fixed

Location:

trunk

Files:

• debian/changelog (modified) (1 diff)
• delete_spam.py.in (modified) (4 diffs)

trunk/debian/changelog

@@ +1 @@
+email2trac (1.4.1-1) stable; urgency=low
+
+  * delete_spam still used trac_version in /etc/email2trac.conf
+
+ -- Bas van der Vlies <basv@sara.nl>  Thu, 20 May 2010 15:40:20 +0200
+
 email2trac (1.4.0-3) stable; urgency=low
 

trunk/delete_spam.py.in

@@ -43 +43 @@
 import ConfigParser
 
-trac_default_version = 0.10
+from trac import __version__ as trac_version
 
 def ReadConfig(file, name):
@@ -147 +147 @@
                 elif opt in ['-v', '--verbose']:
                         VERBOSE = True
+
+        ## trac version is defined like this  X.version.X
+        #
+        version = int(trac_version.split('.')[1])
+        if VERBOSE:
+                print "Found trac version: %d" %version
+
+        if version < 10:
+                print 'Trac version %s is not suported' %(version)
         
         settings = ReadConfig(configfile, project_name)
@@ -153 +162 @@
                 print 'No project defined in config file, eg:\n\t project: /data/trac/bas'
                 sys.exit(1)
-
-        if settings.has_key('trac_version'):
-                version = float(settings['trac_version'])
-        else:
-                version = trac_default_version
 
         settings['DRY_RUN'] = DRY_RUN
@@ -167 +171 @@
 
 
-        if version < 0.10:
-                print 'Trac version %s is not suported' %(version)
 
         new_delete_spam(settings)