From 94655584cba7543781a8d45fdacbb6027a38b07c Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Sat, 30 Apr 2016 12:40:59 -0700 Subject: bitbake: bb.utils: let loaded plugins provide a plugin object This lets us avoid treating the module like an object, so no globals are needed, if one chooses to do so. (Bitbake rev: 71bfd5beb0d0ed88c7c14bbfd5ca1a1b56122bc1) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index c54ff5b92b..5e735d3fa7 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -1477,5 +1477,7 @@ def load_plugins(logger, plugins, pluginpath): if name != '__init__': plugin = load_plugin(name) if hasattr(plugin, 'plugin_init'): - plugin.plugin_init(plugins) - plugins.append(plugin) + obj = plugin.plugin_init(plugins) + plugins.append(obj or plugin) + else: + plugins.append(plugin) -- cgit v1.2.3-54-g00ecf