From: Ola x Nilsson <ola.x.nilsson@axis.com>
Date: Tue, 25 Oct 2016 11:03:35 +0000 (+0200)
Subject: recipetool: Load plugins in a well defined order
X-Git-Tag: uninative-1.5~1156
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7a8726a3662a3909dc6ef6e8d1029d0b1aa938c3;p=openembedded-core.git

recipetool: Load plugins in a well defined order

To allow recipetool plugins in one layer to shadow another in a well
defined way, first search BBPATH/lib/recipetool directories and then
scripts/lib/recipetool and load only the first found.

The previous search and load loop would load all found plugins with the
ones found later replacing any found before.

Signed-off-by: Ola x Nilsson <ola.x.nilsson@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/recipetool b/scripts/recipetool
index 1052cd2b22..00c9007b1c 100755
--- a/scripts/recipetool
+++ b/scripts/recipetool
@@ -78,8 +78,8 @@ def main():
 
     tinfoil = tinfoil_init(False)
     try:
-        for path in ([scripts_path] +
-                    tinfoil.config_data.getVar('BBPATH', True).split(':')):
+        for path in (tinfoil.config_data.getVar('BBPATH', True).split(':')
+                     + [scripts_path]):
             pluginpath = os.path.join(path, 'lib', 'recipetool')
             scriptutils.load_plugins(logger, plugins, pluginpath)