summaryrefslogtreecommitdiffstats
path: root/lib/bb/parse
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:14:41 +0100
commit366af3be1cffd64e4a79c15990c1e05869022c14 (patch)
treeb23d9b6208cd2ba81221c3b6a267505106ce5bc0 /lib/bb/parse
parent508aad9d5db7e51328b1fd6ee53b4bc3720a30b7 (diff)
downloadbitbake-366af3be1cffd64e4a79c15990c1e05869022c14.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/parse')
-rw-r--r--lib/bb/parse/parse_py/ConfHandler.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py
index 861faf0e7..8d7a0d562 100644
--- a/lib/bb/parse/parse_py/ConfHandler.py
+++ b/lib/bb/parse/parse_py/ConfHandler.py
@@ -97,7 +97,6 @@ def include(parentfn, fn, lineno, data, error_out):
if error_out:
raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), parentfn, lineno)
logger.debug(2, "CONF file '%s' not found", fn)
- bb.parse.mark_dependency(data, fn)
# We have an issue where a UI might want to enforce particular settings such as
# an empty DISTRO variable. If configuration files do something like assigning