From 3db9d6e02d6ebfcce0e83f7875f5dc1f6bdce157 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 May 2015 17:28:56 +0100 Subject: 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 --- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 - 1 file changed, 1 deletion(-) (limited to 'bitbake/lib/bb/parse') 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): 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 -- cgit v1.2.3-54-g00ecf