Skip to content

Commit fd4515e

Browse files
committed
[Plugin Installer] Make version compare behaviour unified with the repository app
1 parent f5271a1 commit fd4515e

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

python/pyplugin_installer/version_compare.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,15 @@ def splitVersion(s):
169169
return l
170170

171171

172-
def isCompatible(curVer, minVer, maxVer=None):
172+
def isCompatible(curVer, minVer, maxVer):
173173
""" Compare current QGIS version with qgisMinVersion and qgisMaxVersion """
174-
minVer = splitVersion( re.sub(r'[^0-9.]+', '', minVer) )
175-
maxVer = splitVersion( re.sub(r'[^0-9.]+', '', maxVer) )
176-
curVer = splitVersion( re.sub(r'[^0-9.]+', '', curVer) )
177174

178-
if not minVer or not curVer:
175+
if not minVer or not curVer or not maxVer:
179176
return False
180177

181-
if not maxVer:
182-
maxVer = [minVer[0], "99", "99"]
178+
minVer = splitVersion( re.sub(r'[^0-9.]+', '', minVer) )
179+
maxVer = splitVersion( re.sub(r'[^0-9.]+', '', maxVer) )
180+
curVer = splitVersion( re.sub(r'[^0-9.]+', '', curVer) )
183181

184182
if len(minVer)<3:
185183
minVer += ["0"]
@@ -190,8 +188,8 @@ def isCompatible(curVer, minVer, maxVer=None):
190188
if len(maxVer)<3:
191189
maxVer += ["99"]
192190

193-
minVer = "%02d%02d%02d" % ( int(minVer[0]), int(minVer[1]), int(minVer[2]) )
194-
maxVer = "%02d%02d%02d" % ( int(maxVer[0]), int(maxVer[1]), int(maxVer[2]) )
195-
curVer = "%02d%02d%02d" % ( int(curVer[0]), int(curVer[1]), int(curVer[2]) )
191+
minVer = "%04d%04d%04d" % ( int(minVer[0]), int(minVer[1]), int(minVer[2]) )
192+
maxVer = "%04d%04d%04d" % ( int(maxVer[0]), int(maxVer[1]), int(maxVer[2]) )
193+
curVer = "%04d%04d%04d" % ( int(curVer[0]), int(curVer[1]), int(curVer[2]) )
196194

197195
return ( minVer <= curVer and maxVer >= curVer)

0 commit comments

Comments
 (0)