From 6623d79adaf445081e68b307355292077800d4f4 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 9 Apr 2010 17:11:03 -0700 Subject: Stop using functions via 'bb' that were moved from there to other modules (Bitbake rev: 03a6c26f8da226f442c3cab557e4733f7cd6eeac) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/__init__.py | 3 ++- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 2a7897cdf2..4c7a98f330 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py @@ -29,6 +29,7 @@ __all__ = [ 'ParseError', 'SkipPackage', 'cached_mtime', 'mark_dependency', handlers = [] import bb, os +import bb.utils class ParseError(Exception): """Exception raised when parsing fails""" @@ -82,7 +83,7 @@ def init(fn, data): def resolve_file(fn, d): if not os.path.isabs(fn): - fn = bb.which(bb.data.getVar("BBPATH", d, 1), fn) + fn = bb.utils.which(bb.data.getVar("BBPATH", d, 1), fn) if not fn: raise IOError("file %s not found" % fn) diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 6baf94554c..5c02299524 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -25,6 +25,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import re, bb.data, os, sys +import bb.utils from bb.parse import ParseError, resolve_file, ast #__config_regexp__ = re.compile( r"(?Pexport\s*)?(?P[a-zA-Z0-9\-_+.${}]+)\s*(?P:)?(?P\?)?=\s*(?P['\"]?)(?P.*)(?P=apo)$") @@ -60,7 +61,7 @@ def include(oldfn, fn, data, error_out): if not os.path.isabs(fn): dname = os.path.dirname(oldfn) bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1)) - abs_fn = bb.which(bbpath, fn) + abs_fn = bb.utils.which(bbpath, fn) if abs_fn: fn = abs_fn -- cgit v1.2.3