Merge branch '3.5'

This commit is contained in:
Ghostkeeper 2018-09-13 16:27:49 +02:00
commit 5a374f31ef
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A

View file

@ -488,7 +488,17 @@ class Toolbox(QObject, Extension):
local_version = Version(local_package["package_version"])
remote_version = Version(remote_package["package_version"])
return remote_version > local_version
can_upgrade = False
if remote_version > local_version:
can_upgrade = True
# A package with the same version can be built to have different SDK versions. So, for a package with the same
# version, we also need to check if the current one has a lower SDK version. If so, this package should also
# be upgradable.
elif remote_version == local_version and local_package.get("sdk_version", 0) < int(self._getSDKVersion()):
can_upgrade = True
return can_upgrade
@pyqtSlot(str, result = bool)
def canDowngrade(self, package_id: str) -> bool: