From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 27 May 2015 16:28:56 +0000 (+0100)
Subject: bitbake: ConfHandler: Fix bogus dependency problems
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3db9d6e02d6ebfcce0e83f7875f5dc1f6bdce157;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 861faf0e767..8d7a0d562a3 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