From 95c54512c9fcdbaa419891e46fd99102722ba3d8 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 14 Jul 2015 22:56:00 +0100 Subject: lib/oe/recipeutils: fix replace_dir_vars to return the correct variables If we sort by length of name here we get the variables we are interested in first. I've tested this with all of the variables we care about (the ones at the top of bitbake.conf) and it returns the right results. This fixes the failures we've been seeing in the oe-selftest test_recipetool_appendfile_* tests. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- meta/lib/oe/recipeutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index bd812ccbd1..78d69267ac 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -617,7 +617,8 @@ def find_layerdir(fn): def replace_dir_vars(path, d): """Replace common directory paths with appropriate variable references (e.g. /etc becomes ${sysconfdir})""" dirvars = {} - for var in d: + # Sort by length so we get the variables we're interested in first + for var in sorted(d.keys(), key=len): if var.endswith('dir') and var.lower() == var: value = d.getVar(var, True) if value.startswith('/') and not '\n' in value and value not in dirvars: -- cgit 1.2.3-korg