diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-23 17:38:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 22:52:15 +0000 |
commit | 99d326a818a49faf457c707ceeec6163bf8c8e16 (patch) | |
tree | 6e03dca72ed109a691356bd2d9feb172423da6ab /bitbake/lib/bb/parse/ast.py | |
parent | ebc0d4252a19e6ab38052473e54138d29b172dfc (diff) | |
download | poky-99d326a818a49faf457c707ceeec6163bf8c8e16.tar.gz |
bitbake: add file and line number to ParseError
Ensure that a file and line number are reported for ParseError where
possible. This helps particularly in the case of inherit and require
which previously did not report either of these upon failure.
(Bitbake rev: f588ba69622a2df35417ced184e56c79ac1b40d5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/ast.py')
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 31c930d9cf..94fa175bba 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -59,9 +59,9 @@ class IncludeNode(AstNode): | |||
59 | 59 | ||
60 | # TODO: Cache those includes... maybe not here though | 60 | # TODO: Cache those includes... maybe not here though |
61 | if self.force: | 61 | if self.force: |
62 | bb.parse.ConfHandler.include(self.filename, s, data, "include required") | 62 | bb.parse.ConfHandler.include(self.filename, s, self.lineno, data, "include required") |
63 | else: | 63 | else: |
64 | bb.parse.ConfHandler.include(self.filename, s, data, False) | 64 | bb.parse.ConfHandler.include(self.filename, s, self.lineno, data, False) |
65 | 65 | ||
66 | class ExportNode(AstNode): | 66 | class ExportNode(AstNode): |
67 | def __init__(self, filename, lineno, var): | 67 | def __init__(self, filename, lineno, var): |
@@ -267,7 +267,7 @@ class InheritNode(AstNode): | |||
267 | self.classes = classes | 267 | self.classes = classes |
268 | 268 | ||
269 | def eval(self, data): | 269 | def eval(self, data): |
270 | bb.parse.BBHandler.inherit(self.classes, data) | 270 | bb.parse.BBHandler.inherit(self.classes, self.filename, self.lineno, data) |
271 | 271 | ||
272 | def handleInclude(statements, filename, lineno, m, force): | 272 | def handleInclude(statements, filename, lineno, m, force): |
273 | statements.append(IncludeNode(filename, lineno, m.group(1), force)) | 273 | statements.append(IncludeNode(filename, lineno, m.group(1), force)) |
@@ -450,7 +450,7 @@ def multi_finalize(fn, d): | |||
450 | d.setVar("BBEXTENDVARIANT", variantmap[name]) | 450 | d.setVar("BBEXTENDVARIANT", variantmap[name]) |
451 | else: | 451 | else: |
452 | d.setVar("PN", "%s-%s" % (pn, name)) | 452 | d.setVar("PN", "%s-%s" % (pn, name)) |
453 | bb.parse.BBHandler.inherit([extendedmap[name]], d) | 453 | bb.parse.BBHandler.inherit([extendedmap[name]], fn, 0, d) |
454 | 454 | ||
455 | safe_d.setVar("BBCLASSEXTEND", extended) | 455 | safe_d.setVar("BBCLASSEXTEND", extended) |
456 | _create_variants(datastores, extendedmap.keys(), extendfunc) | 456 | _create_variants(datastores, extendedmap.keys(), extendfunc) |