bitbake: ConfHandler: Don't strip leading spaces
cover bitbake: ConfHandler: Don't strip leading spaces
The following changes since commit 1979d9162a335b7d4718a6697ca57bfa16237f0e:
bitbake: gitsmy.py: Fix unpack of submodules of submodules (2019-01-24 17:45:49 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/conf
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/conf
Robert Yang (1):
bitbake: ConfHandler: Don't strip leading spaces
bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH 1/1 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/lib/bb/parse/parse_py/ConfHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
bitbake/lib/bb/parse/parse_py/ConfHandler.py +1 -1
@@ -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))
Signature · 1 line
2.7.4