[Plugin Installer] More uniform behaviour when comparing versions: al…

…ways exclude any non-numeric parts
qgis · Sep 12, 2013 · af04c79 · af04c79
1 parent 040e9d5
commit af04c79
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/python/pyplugin_installer/version_compare.py b/python/pyplugin_installer/version_compare.py
@@ -46,6 +46,8 @@
 ALPHA, BETA, RC, PREVIEW and TRUNK which make the version number lower.
 """
 
+import re
+
 # ------------------------------------------------------------------------ #
 def normalizeVersion(s):
   """ remove possible prefix from given string and convert to uppercase """
@@ -169,9 +171,9 @@ def splitVersion(s):
 
 def isCompatible(curVer, minVer, maxVer=None):
   """ Compare current QGIS version with qgisMinVersion and qgisMaxVersion """
-  minVer = splitVersion(minVer)
+  minVer = splitVersion( re.sub(r'[^0-9.]+', '', minVer) )
-  maxVer = splitVersion(maxVer)
+  maxVer = splitVersion( re.sub(r'[^0-9.]+', '', maxVer) )
-  curVer = splitVersion( curVer.split("-")[0] )
+  curVer = splitVersion( re.sub(r'[^0-9.]+', '', curVer) )
 
   if not minVer or not curVer:
     return False