bitbake: bitbake: ConfHandler: Don't strip leading spaces

Fixed:
- Add the following lines to conf/local.conf:
  FOO = "BAR1"
  FOO_append = "\
      BAR2"

  $ bitbake -e | grep '^FOO'
  FOO="BAR1BAR2"

  The leading spaces in the second line have been removed.

- But if add the previous two lines to base.bbclass:
  $ bitbake -e | grep '^FOO'
  FOO="BAR1    BAR2"

  The leading spaces in the second line are preserved, this is inconsistent, now
  fix ConfHandler to preserve leading spaces.

[YOCTO #12380]

(Bitbake rev: 8c3bc15a7b5e0a81d7b6c9d3fe43fbff63207156)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2019-01-25 17:53:29 +08:00 committed by Richard Purdie
parent 07735d117d
commit 2c15d8000d

View File

@ -147,7 +147,7 @@ def handle(fn, data, include):
continue
s = s.rstrip()
while s[-1] == '\\':
s2 = f.readline().strip()
s2 = f.readline().rstrip()
lineno = lineno + 1
if (not s2 or s2 and s2[0] != "#") and s[0] == "#" :
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))