summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-05-19 17:43:52 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-05-19 17:43:52 +0000
commita27ed0605a581de12798d04ab81f8d452d695edb (patch)
tree9c46ca7e9db789b949ffdb0eb0bc8674e1719c0a
parent1c4fccbabcdd0308a39963dea4887c2aaeea6067 (diff)
downloadbitbake-a27ed0605a581de12798d04ab81f8d452d695edb.tar.gz
parse_py/BBHandler.py: Make sure __inherit_cache is updated before calling include()
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/parse/parse_py/BBHandler.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1eda9573..b52a6e350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
Changes in BitBake 1.6.7:
+ - Make sure __inherit_cache is updated before calling include()
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 cbc88970d..33ed10313 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -66,9 +66,8 @@ def inherit(files, d):
if not file in __inherit_cache.split():
debug(2, "BB %s:%d: inheriting %s" % (fn, lineno, file))
__inherit_cache += " %s" % file
+ data.setVar('__inherit_cache', __inherit_cache, d)
include(fn, file, d)
- data.setVar('__inherit_cache', __inherit_cache, d)
-
def handle(fn, d, include = 0):
global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __bbpath_found__, __residue__