diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 |
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 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 @@ | |||
25 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 25 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
26 | 26 | ||
27 | import re, bb.data, os, sys | 27 | import re, bb.data, os, sys |
28 | import bb.utils | ||
28 | from bb.parse import ParseError, resolve_file, ast | 29 | from bb.parse import ParseError, resolve_file, ast |
29 | 30 | ||
30 | #__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)$") | 31 | #__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): | |||
60 | if not os.path.isabs(fn): | 61 | if not os.path.isabs(fn): |
61 | dname = os.path.dirname(oldfn) | 62 | dname = os.path.dirname(oldfn) |
62 | bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1)) | 63 | bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1)) |
63 | abs_fn = bb.which(bbpath, fn) | 64 | abs_fn = bb.utils.which(bbpath, fn) |
64 | if abs_fn: | 65 | if abs_fn: |
65 | fn = abs_fn | 66 | fn = abs_fn |
66 | 67 | ||