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

Merge branch '3.3'

Browse source
This commit is contained in:
Lipu Fei 2018-04-10 11:41:13 +02:00
commit 107c10b860
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/PluginBrowser/PluginBrowser.py
View file

@ -6,6 +6,7 @@ from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkRepl
from UM.Application import Application
from UM.Logger import Logger
from UM.PluginError import PluginNotFoundError
from UM.PluginRegistry import PluginRegistry
from UM.Qt.Bindings.PluginsModel import PluginsModel
from UM.Extension import Extension
@ -302,10 +303,15 @@ class PluginBrowser(QObject, Extension):
return self._plugins_model
def _checkCanUpgrade(self, plugin_id, version):
if plugin_id not in self._plugin_registry.getInstalledPlugins():
if not self._plugin_registry.isInstalledPlugin(plugin_id):
return False
try:
plugin_object = self._plugin_registry.getPluginObject(plugin_id)
except PluginNotFoundError:
Logger.log("w", "Could not find plugin %s", plugin_id)
return False
plugin_object = self._plugin_registry.getPluginObject(plugin_id)
# Scan plugin server data for plugin with the given id:
for plugin in self._plugins_metadata:
if plugin_id == plugin["id"]: