diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 16:17:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-02 13:03:45 +0000 |
| commit | 9f37afff200d748beddc2a70f55a72c2714e3120 (patch) | |
| tree | 1a7da0f9c8f554d29c1c7f1f1a17020b21b6f116 | |
| parent | 78ae96e667d3fbb8649fe25eb073e15a99d61cc8 (diff) | |
| download | bitbake-9f37afff200d748beddc2a70f55a72c2714e3120.tar.gz | |
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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index 349fcfe87..bdd1e79e2 100644 --- a/lib/bb/data.py +++ b/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 |