From b1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 11:21:22 +0000 Subject: meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx) sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie --- meta/classes/recipe_sanity.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/recipe_sanity.bbclass') diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index b3246599b9..da8ad76c96 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -66,7 +66,7 @@ def can_use_autotools_base(cfgdata, d): def can_remove_FILESPATH(cfgdata, d): expected = cfgdata.get("FILESPATH") #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', True).split(':') for p in d.getVar('FILESPATHPKG', True).split(':') for o in (d.getVar('OVERRIDES', True) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" - expectedpaths = bb.data.expand(expected, d) + expectedpaths = d.expand(expected) unexpanded = d.getVar("FILESPATH", 0) filespath = d.getVar("FILESPATH", True).split(":") filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] @@ -91,7 +91,7 @@ def can_remove_FILESDIR(cfgdata, d): return unexpanded != expected and \ os.path.exists(expanded) and \ (expanded in filespath or - expanded == bb.data.expand(expected, d)) + expanded == d.expand(expected)) def can_remove_others(p, cfgdata, d): for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS", @@ -104,7 +104,7 @@ def can_remove_others(p, cfgdata, d): try: expanded = d.getVar(k, True) - cfgexpanded = bb.data.expand(cfgunexpanded, d) + cfgexpanded = d.expand(cfgunexpanded) except bb.fetch.ParameterError: continue -- cgit v1.2.3-54-g00ecf