[QGIS Commit] r13643 - trunk/qgis/python/plugins/GdalTools/tools

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-06-04 07:16:35 -0400 (Fri, 04 Jun 2010)
New Revision: 13643

Modified:
   trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
Log:
manage string in release name

Modified: trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-06-04 02:20:58 UTC (rev 13642)
+++ trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-06-04 11:16:35 UTC (rev 13643)
@@ -622,14 +622,10 @@
       if len(nums) > 1:
         vers[1] = int(nums[1])
       if len(nums) > 2:
-        pos = nums[2].find( 'dev' )
-        if pos != -1:
-          n = nums[2][:pos]
-          vers[2] = int(n)
-        else:
-          vers[2] = int(nums[2])
+        n = QString(nums[2]).remove( QRegExp( "[^0-9].*$" ) )
+		if not n.isEmpty():
+			vers[2] = int(n)
 
-
       return (vers[0], vers[1], vers[2])
 
   def __cmp__(self, other):