diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2007-05-19 17:48:17 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2007-05-19 17:48:17 +0000 |
| commit | deeb549d54d4ef6f3ece515be1ecb8f20d3b358f (patch) | |
| tree | f7e817aaf9940e6897e23f157167fadfdcffcbd2 | |
| parent | a27ed0605a581de12798d04ab81f8d452d695edb (diff) | |
| download | bitbake-deeb549d54d4ef6f3ece515be1ecb8f20d3b358f.tar.gz | |
Fix a second kind of __inherit_cache race (trunk + branches)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,5 @@ Changes in BitBake 1.6.7: - - Make sure __inherit_cache is updated before calling include() + - Make sure __inherit_cache is updated before calling include() (from Michael Krelin) Changes in BitBake 1.6.5: - Update the MANIFEST file diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index 33ed10313..e6239031a 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -68,6 +68,7 @@ def inherit(files, d): __inherit_cache += " %s" % file data.setVar('__inherit_cache', __inherit_cache, d) include(fn, file, d) + __inherit_cache = data.getVar('__inherit_cache', d) or "" def handle(fn, d, include = 0): global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __bbpath_found__, __residue__ |