From: Khem Raj Date: Sat, 23 Jan 2010 03:23:00 +0000 (-0800) Subject: bitbake: BBHandler: pass lineno and fn to handleMethod X-Git-Tag: 2011-1~6247 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=99b4b10dc1e03b18fa4f7e7f7918d0d07315ed76;p=openembedded-core.git 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 Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- 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 __parsed_methods__ = methodpool.get_parsed_dict() # parsing routines, to be moved into AST classes -def handleMethod(func_name, body, d): +def handleMethod(func_name, lineno, fn, body, d): if func_name == "__anonymous": funcname = ("__anon_%s_%s" % (lineno, fn.translate(string.maketrans('/.+-', '____')))) if not funcname in methodpool._parsed_fns: @@ -321,7 +321,7 @@ def feeder(lineno, s, fn, root, d): if __infunc__: if s == '}': __body__.append('') - handleMethod(__infunc__, __body__, d) + handleMethod(__infunc__, lineno, fn, __body__, d) __infunc__ = "" __body__ = [] else: