diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 12:56:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 12:56:06 +0000 |
commit | 847b717862a518746bc5e457f40760e3bd36f1db (patch) | |
tree | 4ef8fc3325582a96d97d24b4633213c3e518b7f8 | |
parent | 6f454c10bcdd5245ea9297f5334fc56ac06dbdb9 (diff) | |
download | poky-847b717862a518746bc5e457f40760e3bd36f1db.tar.gz |
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>
-rw-r--r-- | bitbake/lib/bb/cache.py | 11 |
1 files changed, 10 insertions, 1 deletions
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)): | |||
114 | if not pn in packages: | 114 | if not pn in packages: |
115 | packages.append(pn) | 115 | packages.append(pn) |
116 | 116 | ||
117 | skip = cls.getvar('__SKIPPED', metadata) | ||
118 | if skip: | ||
119 | return RecipeInfo(None, None, None, None, None, | ||
120 | None, None, None, None, None, | ||
121 | None, skip, None, None, None, | ||
122 | None, None, None, None, None, | ||
123 | None, None, None, None, None, | ||
124 | None, None) | ||
125 | |||
117 | return RecipeInfo( | 126 | return RecipeInfo( |
118 | tasks = tasks, | 127 | tasks = tasks, |
119 | basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata), | 128 | basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata), |
@@ -124,7 +133,7 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)): | |||
124 | {'tasks': [], 'parents': {}}, | 133 | {'tasks': [], 'parents': {}}, |
125 | variants = cls.listvar('__VARIANTS', metadata) + [''], | 134 | variants = cls.listvar('__VARIANTS', metadata) + [''], |
126 | 135 | ||
127 | skipped = cls.getvar('__SKIPPED', metadata), | 136 | skipped = skip, |
128 | timestamp = bb.parse.cached_mtime(filename), | 137 | timestamp = bb.parse.cached_mtime(filename), |
129 | packages = cls.listvar('PACKAGES', metadata), | 138 | packages = cls.listvar('PACKAGES', metadata), |
130 | pn = pn, | 139 | pn = pn, |