sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix plugin loading from zip (dependencies followup)

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-04-09 15:21:09 +02:00
parent b2aa97843d
commit e57d1e06f0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/pyplugin_installer/plugindependencies.py
View File

@ -15,7 +15,7 @@ __copyright__ = 'Copyright 2018, GISCE-TI S.L.'
from configparser import NoOptionError, NoSectionError from configparser import NoOptionError, NoSectionError
from .version_compare import compareVersions from .version_compare import compareVersions
from . import installer as plugin_installer from . import installer as plugin_installer
from qgis.utils import updateAvailablePlugins, plugins_metadata_parser from qgis.utils import updateAvailablePlugins
def __plugin_name_map(plugin_data_values): def __plugin_name_map(plugin_data_values):
@ -28,8 +28,8 @@ def __plugin_name_map(plugin_data_values):
def __get_plugin_deps(plugin_id): def __get_plugin_deps(plugin_id):
result = {} result = {}
updateAvailablePlugins() metadata_parser = updateAvailablePlugins()
parser = plugins_metadata_parser[plugin_id] parser = metadata_parser[plugin_id]
try: try:
plugin_deps = parser.get('general', 'plugin_dependencies') plugin_deps = parser.get('general', 'plugin_dependencies')
except (NoOptionError, NoSectionError): except (NoOptionError, NoSectionError):
@ -69,7 +69,7 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p
if installed_plugins is None: if installed_plugins is None:
updateAvailablePlugins() updateAvailablePlugins()
metadata_parser = plugins_metadata_parser metadata_parser = updateAvailablePlugins()
installed_plugins = {metadata_parser[k].get('general', 'name'): metadata_parser[k].get('general', 'version') for k, v in metadata_parser.items()} installed_plugins = {metadata_parser[k].get('general', 'name'): metadata_parser[k].get('general', 'version') for k, v in metadata_parser.items()}
if plugin_data is None: if plugin_data is None:

1
python/utils.py
View File

@ -282,6 +282,7 @@ def updateAvailablePlugins():
available_plugins = plugins available_plugins = plugins
global plugins_metadata_parser global plugins_metadata_parser
plugins_metadata_parser = metadata_parser plugins_metadata_parser = metadata_parser
return metadata_parser
def pluginMetadata(packageName, fct): def pluginMetadata(packageName, fct):