summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-16 19:14:49 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-16 19:14:49 +0000
commit31511eb9787014c26faf72be1d4d7329251727d9 (patch)
tree61756184db7a65d61123768f057cdca836e3a9d2 /bitbake/lib
parent10481859f40764ec498640c5f76264b8913f93fd (diff)
downloadpoky-31511eb9787014c26faf72be1d4d7329251727d9.tar.gz
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
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/parse/__init__.py4
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py6
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py1
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):
50 return 0 50 return 0
51 return __mtime_cache[f] 51 return __mtime_cache[f]
52 52
53def update_mtime(f):
54 __mtime_cache[f] = os.stat(f)[8]
55 return __mtime_cache[f]
56
53def mark_dependency(d, f): 57def mark_dependency(d, f):
54 if f.startswith('./'): 58 if f.startswith('./'):
55 f = "%s/%s" % (os.getcwd(), f[2:]) 59 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):
122 abs_fn = fn 122 abs_fn = fn
123 123
124 if ext != ".bbclass": 124 if ext != ".bbclass":
125 bbpath.insert(0, os.path.dirname(abs_fn)) 125 dname = os.path.dirname(abs_fn)
126 data.setVar('BBPATH', ":".join(bbpath), d) 126 if bbpath[0] != dname:
127 bbpath.insert(0, dname)
128 data.setVar('BBPATH', ":".join(bbpath), d)
127 129
128 if include: 130 if include:
129 bb.parse.mark_dependency(d, abs_fn) 131 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):
118 init(data) 118 init(data)
119 119
120 if include == 0: 120 if include == 0:
121 bb.data.inheritFromOS(data)
122 oldfile = None 121 oldfile = None
123 else: 122 else:
124 oldfile = bb.data.getVar('FILE', data) 123 oldfile = bb.data.getVar('FILE', data)