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

3 files changed, 8 insertions, 3 deletions

diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 3c9ba8e6da..5dd96c4136 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -50,6 +50,10 @@ def cached_mtime_noerror(f):
             return 0
     return __mtime_cache[f]
 
+def update_mtime(f):
+    __mtime_cache[f] = os.stat(f)[8]
+    return __mtime_cache[f]
+
 def mark_dependency(d, f):
     if f.startswith('./'):
         f = "%s/%s" % (os.getcwd(), f[2:])
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index d7bf6d4f37..cc8bc92e1d 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 e6488bbe11..f8a49689e2 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)