* [PATCH 0/1] bitbake: ConfHandler: Don't strip leading spaces
@ 2019-01-25 9:53 Robert Yang
2019-01-25 9:53 ` [PATCH 1/1] " Robert Yang
0 siblings, 1 reply; 2+ messages in thread
From: Robert Yang @ 2019-01-25 9:53 UTC (permalink / raw)
To: bitbake-devel
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(-)
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] bitbake: ConfHandler: Don't strip leading spaces
2019-01-25 9:53 [PATCH 0/1] bitbake: ConfHandler: Don't strip leading spaces Robert Yang
@ 2019-01-25 9:53 ` Robert Yang
0 siblings, 0 replies; 2+ messages in thread
From: Robert Yang @ 2019-01-25 9:53 UTC (permalink / raw)
To: bitbake-devel
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]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 9d3ebe1..ea49f8c 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):
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))
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-25 9:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-25 9:53 [PATCH 0/1] bitbake: ConfHandler: Don't strip leading spaces Robert Yang
2019-01-25 9:53 ` [PATCH 1/1] " Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.