From: Christopher Larson <chris_larson@mentor.com>
Date: Sat, 30 Apr 2016 19:40:59 +0000 (-0700)
Subject: bitbake: bb.utils: let loaded plugins provide a plugin object
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94655584cba7543781a8d45fdacbb6027a38b07c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index c54ff5b92b9..5e735d3fa72 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)