Bug #645 fixing
cover Bug #645 fixing
Modified the function emit_var() in bitbake/lib/bb/data.py for Bug #645
1. added "#" for multiple line comment
2. added " \" for multiple line shell variable.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug645
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug645
Thanks,
Lianhao Lu <[email protected]>
---
Lianhao Lu (1):
bitbake/data.py: corrected the output for shell syntax.
bitbake/lib/bb/data.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
PATCH 1/1 bitbake/data.py: corrected the output for shell syntax.
[BUGID# 645], modify the emit_var()
1. Added "#" to the beginning of each line if the comment contains multiple lines.
2. Added "\" to the end of each line if the shell variable value contains multiple lines.
--- bitbake/lib/bb/data.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
bitbake/lib/bb/data.py +3 -1
@@ -192,7 +192,8 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): return 0 if all: - o.write('# %s=%s\n' % (var, oval)) + commentVal = re.sub('\n', '\n#', str(oval)) + o.write('# %s=%s\n' % (var, commentVal)) if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all: return 0
@@ -219,6 +220,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): # if we're going to output this within doublequotes, # to a shell, we need to escape the quotes in the var alter = re.sub('"', '\\"', val.strip()) + alter = re.sub('\n', ' \\\n', alter) o.write('%s="%s"\n' % (varExpanded, alter)) return 0
Signature · 1 line
1.7.0.4
Richard Purdie
AppliedQuoted 14 lines · Lianhao Lu
Modified the function
emit_var()inbitbake/lib/bb/data.pyfor Bug #6451. added "#" for multiple line comment
2. added " \" for multiple line shell variable.Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug645
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug645Thanks,
Lianhao Lu <[email protected]>
---
Quoted 5 lines
Lianhao Lu (1):
bitbake/data.py: corrected the output for shell syntax.bitbake/lib/bb/data.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
Merged into Poky's master branch and applied to upstream bitbake too.
Cheers,
Richard