From 913e78898e65e1d95c6313e86854cdc2ab9e35aa Mon Sep 17 00:00:00 2001
From: Holger Freyther <ich@tamarin.(none)>
Date: Sun, 17 May 2009 06:19:39 +0200
Subject: bitbake: [parse] Unify opening a file...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 bitbake/lib/bb/parse/parse_py/BBHandler.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')

diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 7707705aaf..c6931650da 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -30,7 +30,7 @@ import bb.fetch, bb.build, bb.utils
 from bb import data, fetch, methodpool
 
 from ConfHandler import include, init
-from bb.parse import ParseError
+from bb.parse import ParseError, resolve_file
 
 __func_start_regexp__    = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" )
 __inherit_regexp__       = re.compile( r"inherit\s+(.+)" )
@@ -145,20 +145,7 @@ def handle(fn, d, include = 0):
     else:
         oldfile = None
 
-    bbpath = (data.getVar('BBPATH', d, 1) or '').split(':')
-    if not os.path.isabs(fn):
-        f = None
-        for p in bbpath:
-            j = os.path.join(p, fn)
-            if os.access(j, os.R_OK):
-                abs_fn = j
-                f = open(j, 'r')
-                break
-        if f is None:
-            raise IOError("file %s not found" % fn)
-    else:
-        f = open(fn,'r')
-        abs_fn = fn
+    (f, abs_fn) = resolve_file(fn, d)
 
     if include:
         bb.parse.mark_dependency(d, abs_fn)
@@ -203,7 +190,6 @@ def handle(fn, d, include = 0):
                 darray[cls] = based
             return darray
    
-        bbpath.pop(0)
     if oldfile:
         bb.data.setVar("FILE", oldfile, d)
 
-- 
cgit v1.2.3-54-g00ecf