Skip to content

Commit

Permalink
Merge pull request #9762 from elpaso/plugin-dependencies-fix
Browse files Browse the repository at this point in the history
Fix plugin loading from zip (dependencies followup)
  • Loading branch information
m-kuhn committed Apr 9, 2019
2 parents b2aa978 + e57d1e0 commit ae17fb3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions python/pyplugin_installer/plugindependencies.py
Expand Up @@ -15,7 +15,7 @@
from configparser import NoOptionError, NoSectionError
from .version_compare import compareVersions
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):
Expand All @@ -28,8 +28,8 @@ def __plugin_name_map(plugin_data_values):
def __get_plugin_deps(plugin_id):

result = {}
updateAvailablePlugins()
parser = plugins_metadata_parser[plugin_id]
metadata_parser = updateAvailablePlugins()
parser = metadata_parser[plugin_id]
try:
plugin_deps = parser.get('general', 'plugin_dependencies')
except (NoOptionError, NoSectionError):
Expand Down Expand Up @@ -69,7 +69,7 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p

if installed_plugins is None:
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()}

if plugin_data is None:
Expand Down
1 change: 1 addition & 0 deletions python/utils.py
Expand Up @@ -282,6 +282,7 @@ def updateAvailablePlugins():
available_plugins = plugins
global plugins_metadata_parser
plugins_metadata_parser = metadata_parser
return metadata_parser


def pluginMetadata(packageName, fct):
Expand Down

0 comments on commit ae17fb3

Please sign in to comment.