From 54534a61003fee8075458c3a7f117fc7c7c4f34f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 22 Nov 2013 16:17:39 +0000 Subject: [PATCH] bitbake: data: Fix output inconsistencies for emit_var 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 rev: 9f37afff200d748beddc2a70f55a72c2714e3120) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 349fcfe878..bdd1e79e24 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