diff --git a/python/pyplugin_installer/plugindependencies.py b/python/pyplugin_installer/plugindependencies.py index 6d77b6d8ed5..7f918457442 100644 --- a/python/pyplugin_installer/plugindependencies.py +++ b/python/pyplugin_installer/plugindependencies.py @@ -15,7 +15,7 @@ __copyright__ = 'Copyright 2018, GISCE-TI S.L.' from configparser import NoOptionError, NoSectionError from .version_compare import compareVersions from . import installer as plugin_installer -from qgis.utils import updateAvailablePlugins +from qgis.utils import updateAvailablePlugins, plugins_metadata_parser def __plugin_name_map(plugin_data_values): @@ -28,7 +28,8 @@ def __plugin_name_map(plugin_data_values): def __get_plugin_deps(plugin_id): result = {} - parser = updateAvailablePlugins()[plugin_id] + updateAvailablePlugins() + parser = plugins_metadata_parser[plugin_id] try: plugin_deps = parser.get('general', 'plugin_dependencies') except (NoOptionError, NoSectionError): @@ -67,7 +68,8 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p plugin_deps = __get_plugin_deps(plugin_id) if installed_plugins is None: - metadata_parser = updateAvailablePlugins() + updateAvailablePlugins() + metadata_parser = plugins_metadata_parser 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: diff --git a/python/utils.py b/python/utils.py index 758410a5f69..8495bbefa07 100644 --- a/python/utils.py +++ b/python/utils.py @@ -282,7 +282,6 @@ def updateAvailablePlugins(): available_plugins = plugins global plugins_metadata_parser plugins_metadata_parser = metadata_parser - return metadata_parser def pluginMetadata(packageName, fct):