diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-04-09 17:11:03 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
| commit | 6623d79adaf445081e68b307355292077800d4f4 (patch) | |
| tree | 219d0c9b31de4331703e1a81d3b7f233ac0169cf /bitbake/lib/bb/parse | |
| parent | 1569c1ac851b56bc73bf8ccd5270cbdd9da68a2f (diff) | |
| download | openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.gz openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.bz2 openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.xz openembedded-core-6623d79adaf445081e68b307355292077800d4f4.zip | |
Stop using functions via 'bb' that were moved from there to other modules
(Bitbake rev: 03a6c26f8da226f442c3cab557e4733f7cd6eeac)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse')
| -rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 2a7897cdf..4c7a98f33 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 6baf94554..5c0229952 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"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?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 |