summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-25 17:53:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-06 08:24:50 +0000
commit2c15d8000dc2e2c09838a4bc7b76b0d8647e2a18 (patch)
tree51e917d1acf44ee0fddb6f1ac115ca7181e84aa3 /bitbake/lib/bb
parent07735d117d77c2cfe4d2f0eccab67392b16184df (diff)
downloadpoky-2c15d8000dc2e2c09838a4bc7b76b0d8647e2a18.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 9d3ebe16f4..ea49f8ca93 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -147,7 +147,7 @@ def handle(fn, data, include):
147 continue 147 continue
148 s = s.rstrip() 148 s = s.rstrip()
149 while s[-1] == '\\': 149 while s[-1] == '\\':
150 s2 = f.readline().strip() 150 s2 = f.readline().rstrip()
151 lineno = lineno + 1 151 lineno = lineno + 1
152 if (not s2 or s2 and s2[0] != "#") and s[0] == "#" : 152 if (not s2 or s2 and s2[0] != "#") and s[0] == "#" :
153 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)) 153 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))