summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py5
1 files changed, 4 insertions, 1 deletions
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+(.+)" )
37def handleInclude(m, fn, lineno, data, force): 37def handleInclude(m, fn, lineno, data, force):
38 s = bb.data.expand(m.group(1), data) 38 s = bb.data.expand(m.group(1), data)
39 bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s)) 39 bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s))
40 include(fn, s, data, False) 40 if force:
41 include(fn, s, data, "include required")
42 else
43 include(fn, s, data, False)
41 44
42def handleExport(m, data): 45def handleExport(m, data):
43 bb.data.setVarFlag(m.group(1), "export", 1, data) 46 bb.data.setVarFlag(m.group(1), "export", 1, data)