summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/parse/parse_py/ConfHandler.py
diff options
context:
space:
mode:
authorHolger Freyther <ich@tamarin.(none)>2009-05-19 13:59:50 +0200
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-15 17:07:55 +0000
commit7b57ad901af2ded02995d22718ec6f280a9edd7f (patch)
tree81b9b3909460269bdd60744a255ac923775fa71c /bitbake/lib/bb/parse/parse_py/ConfHandler.py
parent83ec5eaed411225d16a4fc4dc92323e3acc9f5cd (diff)
downloadopenembedded-core-7b57ad901af2ded02995d22718ec6f280a9edd7f.tar.gz
openembedded-core-7b57ad901af2ded02995d22718ec6f280a9edd7f.tar.bz2
openembedded-core-7b57ad901af2ded02995d22718ec6f280a9edd7f.tar.xz
openembedded-core-7b57ad901af2ded02995d22718ec6f280a9edd7f.zip
bitbake: [parser] Make resolve_file only resolve the path
Do not attempt to open the file in the resolve_file method (a lot like bb.which... maybe bb.which can be used). This way we don't need to open/close a file which we have already parsed. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 839a66202..deafd6479 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -84,7 +84,8 @@ def handle(fn, data, include):
else:
oldfile = bb.data.getVar('FILE', data)
- (f, abs_fn) = resolve_file(fn, data)
+ abs_fn = resolve_file(fn, data)
+ f = open(abs_fn, 'r')
if include:
bb.parse.mark_dependency(data, abs_fn)