diff options
author | Khem Raj <raj.khem@gmail.com> | 2010-01-22 19:23:00 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-10 16:43:06 +0000 |
commit | 99b4b10dc1e03b18fa4f7e7f7918d0d07315ed76 (patch) | |
tree | 9207b042fa2a3569eadb669ff5f3c1d6bdc6e5c9 | |
parent | d5519d4ad98d452f32382427accbe15ee9e717a1 (diff) | |
download | poky-99b4b10dc1e03b18fa4f7e7f7918d0d07315ed76.tar.gz |
bitbake: BBHandler: pass lineno and fn to handleMethod
* lineno and fn are needed in handleMethod
to restore the functionality as it was before.
(Bitbake rev: ac6792045959cfee56279c1c4597521e990848e7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 47502adc3c..76deb6b453 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -57,7 +57,7 @@ IN_PYTHON_EOF = -9999999999999 | |||
57 | __parsed_methods__ = methodpool.get_parsed_dict() | 57 | __parsed_methods__ = methodpool.get_parsed_dict() |
58 | 58 | ||
59 | # parsing routines, to be moved into AST classes | 59 | # parsing routines, to be moved into AST classes |
60 | def handleMethod(func_name, body, d): | 60 | def handleMethod(func_name, lineno, fn, body, d): |
61 | if func_name == "__anonymous": | 61 | if func_name == "__anonymous": |
62 | funcname = ("__anon_%s_%s" % (lineno, fn.translate(string.maketrans('/.+-', '____')))) | 62 | funcname = ("__anon_%s_%s" % (lineno, fn.translate(string.maketrans('/.+-', '____')))) |
63 | if not funcname in methodpool._parsed_fns: | 63 | if not funcname in methodpool._parsed_fns: |
@@ -321,7 +321,7 @@ def feeder(lineno, s, fn, root, d): | |||
321 | if __infunc__: | 321 | if __infunc__: |
322 | if s == '}': | 322 | if s == '}': |
323 | __body__.append('') | 323 | __body__.append('') |
324 | handleMethod(__infunc__, __body__, d) | 324 | handleMethod(__infunc__, lineno, fn, __body__, d) |
325 | __infunc__ = "" | 325 | __infunc__ = "" |
326 | __body__ = [] | 326 | __body__ = [] |
327 | else: | 327 | else: |