Skip to content

Commit d174840

Browse files
authored
Merge pull request #9970 from elpaso/bugfix-fix-plugin-deps
Fix plugin dependencies
2 parents 9a612d4 + 46a4435 commit d174840

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

python/pyplugin_installer/plugindependencies.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from configparser import NoOptionError, NoSectionError
1616
from .version_compare import compareVersions
1717
from . import installer as plugin_installer
18-
from qgis.utils import updateAvailablePlugins, plugins_metadata_parser
18+
from qgis.utils import updateAvailablePlugins, metadataParser
1919

2020

2121
def __plugin_name_map(plugin_data_values):
@@ -29,8 +29,7 @@ def __get_plugin_deps(plugin_id):
2929
result = {}
3030
updateAvailablePlugins()
3131
try:
32-
global plugins_metadata_parser
33-
parser = plugins_metadata_parser[plugin_id]
32+
parser = metadataParser()[plugin_id]
3433
plugin_deps = parser.get('general', 'plugin_dependencies')
3534
except (NoOptionError, NoSectionError, KeyError):
3635
return result
@@ -68,9 +67,8 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p
6867
plugin_deps = __get_plugin_deps(plugin_id)
6968

7069
if installed_plugins is None:
71-
global plugins_metadata_parser
7270
updateAvailablePlugins()
73-
metadata_parser = plugins_metadata_parser
71+
metadata_parser = metadataParser()
7472
installed_plugins = {metadata_parser[k].get('general', 'name'): metadata_parser[k].get('general', 'version') for k, v in metadata_parser.items()}
7573

7674
if plugin_data is None:

python/utils.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@ def findPlugins(path):
265265
yield (pluginName, cp)
266266

267267

268+
def metadataParser():
269+
"""Used by other modules to access the local parser object"""
270+
return plugins_metadata_parser
271+
272+
268273
def updateAvailablePlugins():
269274
""" Go through the plugin_paths list and find out what plugins are available. """
270275
# merge the lists

0 commit comments

Comments
 (0)