summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-27 17:28:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 10:17:16 +0100
commit3db9d6e02d6ebfcce0e83f7875f5dc1f6bdce157 (patch)
treef57a087739756349732264078cb84708dcb94f78
parent91c45c016376511e6ca0d2f40eb5be73af09e7ea (diff)
downloadpoky-3db9d6e02d6ebfcce0e83f7875f5dc1f6bdce157.tar.gz
bitbake: ConfHandler: Fix bogus dependency problems
Adding a dependency when errors occur accessing a file when calling handle() is not the correct thing to do. THe handle() code calls resolve_file() which can raise an exception without ever touching "fn" itself, it has also already marked all the dependencies correctly. This leads to bogus files being resolved to the local cwd and hence triggers reparses for no good reason. The solution is to simply remove the bogus dependency. (Bitbake rev: 366af3be1cffd64e4a79c15990c1e05869022c14) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 861faf0e76..8d7a0d562a 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -97,7 +97,6 @@ def include(parentfn, fn, lineno, data, error_out):
97 if error_out: 97 if error_out:
98 raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), parentfn, lineno) 98 raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), parentfn, lineno)
99 logger.debug(2, "CONF file '%s' not found", fn) 99 logger.debug(2, "CONF file '%s' not found", fn)
100 bb.parse.mark_dependency(data, fn)
101 100
102# We have an issue where a UI might want to enforce particular settings such as 101# We have an issue where a UI might want to enforce particular settings such as
103# an empty DISTRO variable. If configuration files do something like assigning 102# an empty DISTRO variable. If configuration files do something like assigning