diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-21 13:14:25 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-10 16:38:00 +0000 |
| commit | 7a4579e7cbc26714771ecb5854702b240a9daca8 (patch) | |
| tree | 7edd73398f10f8df753f8e5245f669922e0e2fdd /bitbake | |
| parent | fb918a758215c7669b4850946280bd58c6e063c4 (diff) | |
| download | openembedded-core-7a4579e7cbc26714771ecb5854702b240a9daca8.tar.gz openembedded-core-7a4579e7cbc26714771ecb5854702b240a9daca8.tar.bz2 openembedded-core-7a4579e7cbc26714771ecb5854702b240a9daca8.zip | |
bitbake: ConfHandler: Fix require vs. include behaviour
(Bitbake rev: 824a032672c8673cae28e492aa916a4750b94efa)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 5 |
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+(.+)" ) 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) |