diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-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 ee9bd760ce..68415735fd 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -178,10 +178,10 @@ def feeder(lineno, s, fn, root, statements, eof=False): | |||
178 | 178 | ||
179 | if s and s[0] == '#': | 179 | if s and s[0] == '#': |
180 | if len(__residue__) != 0 and __residue__[0][0] != "#": | 180 | if len(__residue__) != 0 and __residue__[0][0] != "#": |
181 | bb.fatal("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)) | 181 | bb.fatal("There is a comment on line %s of file %s:\n'''\n%s\n'''\nwhich is in the middle of a multiline expression. This syntax is invalid, please correct it." % (lineno, fn, s)) |
182 | 182 | ||
183 | if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"): | 183 | if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"): |
184 | bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s)) | 184 | bb.fatal("There is a confusing multiline partially commented expression on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (lineno - len(__residue__), fn, "\n".join(__residue__))) |
185 | 185 | ||
186 | if s and s[-1] == '\\': | 186 | if s and s[-1] == '\\': |
187 | __residue__.append(s[:-1]) | 187 | __residue__.append(s[:-1]) |