[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3678/8267] recipetool: Load plugins in a well defined order



commit 8dfc417780c6b119620fc7aaff1f4d7e21c2c2c9
Author: Ola x Nilsson <ola x nilsson axis com>
Date:   Tue Oct 25 13:03:35 2016 +0200

    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.
    
    (From OE-Core rev: 7a8726a3662a3909dc6ef6e8d1029d0b1aa938c3)
    
    Signed-off-by: Ola x Nilsson <ola x nilsson axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/recipetool |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/recipetool b/scripts/recipetool
index 1052cd2..00c9007 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)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]