Patchwork [bitbake-devel,2/4] bitbake: data: Fix output inconsistencies for emit_var

login
register
mail settings
Submitter Robert Yang
Date Dec. 25, 2013, 2:19 a.m.
Message ID <eb8fbbd711c3604f8b63ee0421357f0ad7c4c9bc.1387937195.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/63719/
State New
Headers show

Comments

Robert Yang - Dec. 25, 2013, 2:19 a.m.
From: Richard Purdie <richard.purdie@linuxfoundation.org>

VAL = ""     (not shown)
VAL = " "    (shown as "")
VAL = " x"   (shown as "x")

would all show up rather differently to what would be expected in the
bitbake -e output. This fixes things so they appear consistently.

The output for running some shell functions may also change slightly
but shouldn't change in a way that is likely to cause problems.

[YOCTO #5507]

(Bitbake master rev: fcba5ef0053dc0ef5360e4912609e5d52f5046b0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/data.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 349fcfe..bdd1e79 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -214,7 +214,7 @@  def emit_var(var, o=sys.__stdout__, d = init(), all=False):
         o.write('unset %s\n' % varExpanded)
         return 0
 
-    if not val:
+    if val is None:
         return 0
 
     val = str(val)
@@ -229,7 +229,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('"', '\\"', val)
     alter = re.sub('\n', ' \\\n', alter)
     o.write('%s="%s"\n' % (varExpanded, alter))
     return 0