mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 23:39:22 +00:00
Code Issues Projects Releases Wiki Activity

bitbake/BBHandler: Improve handling of multiline comments and warn users of the change

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-02-22 21:45:26 +00:00
parent be92622339
commit c0f0a8ee0c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bitbake/lib/bb/parse/parse_py/BBHandler.py
View File

@@ -193,9 +193,14 @@ def feeder(lineno, s, fn, root, statements):
if lineno == IN_PYTHON_EOF:
return
# fall through
if s == '' or s[0] == '#': return # skip comments and empty lines
# Skip empty lines
if s == '':
return
if s[0] == '#':
if len(__residue__) != 0 and __residue__[0][0] != "#":
bb.error("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
if s[-1] == '\\':
__residue__.append(s[:-1])
@@ -204,6 +209,10 @@ def feeder(lineno, s, fn, root, statements):
s = "".join(__residue__) + s
__residue__ = []
# Skip comments
if s[0] == '#':
return
m = __func_start_regexp__.match(s)
if m:
__infunc__ = m.group("func") or "__anonymous"