summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-07 12:56:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-07 12:56:06 +0000
commit847b717862a518746bc5e457f40760e3bd36f1db (patch)
tree4ef8fc3325582a96d97d24b4633213c3e518b7f8 /bitbake/lib
parent6f454c10bcdd5245ea9297f5334fc56ac06dbdb9 (diff)
downloadopenembedded-core-847b717862a518746bc5e457f40760e3bd36f1db.tar.gz
openembedded-core-847b717862a518746bc5e457f40760e3bd36f1db.tar.bz2
openembedded-core-847b717862a518746bc5e457f40760e3bd36f1db.tar.xz
openembedded-core-847b717862a518746bc5e457f40760e3bd36f1db.zip
bitbake/cache.py: Expansion of variables in skipped recipes should not be attempted as they can trigger errors
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cache.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index c477501d6..cde136083 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,