3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins'

Browse source
This commit is contained in:
Lipu Fei 2018-09-17 17:27:32 +02:00
commit 4777c3f41d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Toolbox/src/Toolbox.py
View file

@ -5,7 +5,7 @@ import json
import os import os
import tempfile import tempfile
import platform import platform
from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union
from PyQt5.QtCore import QUrl, QObject, pyqtProperty, pyqtSignal, pyqtSlot from PyQt5.QtCore import QUrl, QObject, pyqtProperty, pyqtSignal, pyqtSlot
from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
@ -498,10 +498,6 @@ class Toolbox(QObject, Extension):
local_version = Version(local_package["package_version"]) local_version = Version(local_package["package_version"])
remote_version = Version(remote_package["package_version"]) remote_version = Version(remote_package["package_version"])
if self._getSDKVersion() == "dev":
sdk_version = self._plugin_registry.APIVersion
else:
sdk_version = self._getSDKVersion()
can_upgrade = False can_upgrade = False
if remote_version > local_version: if remote_version > local_version:
can_upgrade = True can_upgrade = True
@ -531,7 +527,11 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str, result = bool) @pyqtSlot(str, result = bool)
def isInstalled(self, package_id: str) -> bool: def isInstalled(self, package_id: str) -> bool:
return self._package_manager.isPackageInstalled(package_id) result = self._package_manager.isPackageInstalled(package_id)
# Also check the old plugins list if it's not found in the package manager.
if not result:
result = self.isOldPlugin(package_id)
return result
@pyqtSlot(str, result = int) @pyqtSlot(str, result = int)
def getNumberOfInstalledPackagesByAuthor(self, author_id: str) -> int: def getNumberOfInstalledPackagesByAuthor(self, author_id: str) -> int: