From 847b717862a518746bc5e457f40760e3bd36f1db Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Jan 2011 12:56:06 +0000 Subject: bitbake/cache.py: Expansion of variables in skipped recipes should not be attempted as they can trigger errors Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index c477501d68..cde136083a 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -114,6 +114,15 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)): if not pn in packages: packages.append(pn) + skip = cls.getvar('__SKIPPED', metadata) + if skip: + return RecipeInfo(None, None, None, None, None, + None, None, None, None, None, + None, skip, None, None, None, + None, None, None, None, None, + None, None, None, None, None, + None, None) + return RecipeInfo( tasks = tasks, basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata), @@ -124,7 +133,7 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)): {'tasks': [], 'parents': {}}, variants = cls.listvar('__VARIANTS', metadata) + [''], - skipped = cls.getvar('__SKIPPED', metadata), + skipped = skip, timestamp = bb.parse.cached_mtime(filename), packages = cls.listvar('PACKAGES', metadata), pn = pn, -- cgit v1.2.3