SF.net SVN: tmda: [2139] trunk/tmda-cgi/CgiVersion.py

Revision: 2139
          http://svn.sourceforge.net/tmda/?rev=2139&view=rev
Author:   lack
Date:     2007-02-08 06:56:21 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
Fixed version checking code so now (1.1.10 > 1.1.6) evaluates as True

Modified Paths:
--------------
    trunk/tmda-cgi/CgiVersion.py

Modified: trunk/tmda-cgi/CgiVersion.py
===================================================================
--- trunk/tmda-cgi/CgiVersion.py	2007-02-01 21:33:05 UTC (rev 2138)
+++ trunk/tmda-cgi/CgiVersion.py	2007-02-08 14:56:21 UTC (rev 2139)
@@ -43,9 +43,25 @@
 All = 'tmda-cgi/%s "%s" (Python/%s on %s)' % \
   (tmda_cgi, Codename, Python, Platform)
 
+def parseVersion(versionString):
+	"""Returns a list of all the integers in the version string:
+		"1.1.3" will return [1,1,3,0]
+		"1.1.0+" will return [1,1,0,1]"""
+	if versionString.endswith("+"):
+		string = versionString[:-1]
+		dev = 1
+	else:
+		dev = 0
+		string = versionString
+	tuple = [ int(x) for x in string.split(".") ]
+	tuple.append(dev)
+	return tuple
+
 def Test():
   "Validate TMDAReqVer."
-  if Version.TMDA < TMDAReqVer:
+  current = parseVersion(Version.TMDA)
+  required = parseVersion(TMDAReqVer)
+  if current < required:
     raise ImportError, \
       "tmda-cgi/%s requires TMDA/%s or later.  TMDA/%s found." % \
       (tmda_cgi, TMDAReqVer, Version.TMDA)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.