From 7a4579e7cbc26714771ecb5854702b240a9daca8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Jan 2010 13:14:25 +0000 Subject: bitbake: ConfHandler: Fix require vs. include behaviour (Bitbake rev: 824a032672c8673cae28e492aa916a4750b94efa) Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py') diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index b22bbc8af5..7069562f07 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -37,7 +37,10 @@ __export_regexp__ = re.compile( r"export\s+(.+)" ) def handleInclude(m, fn, lineno, data, force): s = bb.data.expand(m.group(1), data) bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s)) - include(fn, s, data, False) + if force: + include(fn, s, data, "include required") + else + include(fn, s, data, False) def handleExport(m, data): bb.data.setVarFlag(m.group(1), "export", 1, data) -- cgit v1.2.3-54-g00ecf