From 31511eb9787014c26faf72be1d4d7329251727d9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 16 Sep 2008 19:14:49 +0000 Subject: bitbake parse/__init_.py: Add missing update_mtime function fixing bitbake shell reparse failures git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5196 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 ++++-- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/parse/parse_py') diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index d7bf6d4f3..cc8bc92e1 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -122,8 +122,10 @@ def handle(fn, d, include = 0): abs_fn = fn if ext != ".bbclass": - bbpath.insert(0, os.path.dirname(abs_fn)) - data.setVar('BBPATH', ":".join(bbpath), d) + dname = os.path.dirname(abs_fn) + if bbpath[0] != dname: + bbpath.insert(0, dname) + data.setVar('BBPATH', ":".join(bbpath), d) if include: bb.parse.mark_dependency(d, abs_fn) diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index e6488bbe1..f8a49689e 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -118,7 +118,6 @@ def handle(fn, data, include = 0): init(data) if include == 0: - bb.data.inheritFromOS(data) oldfile = None else: oldfile = bb.data.getVar('FILE', data) -- cgit v1.2.3