data: Fix output inconsistencies for emit_var
PATCH 1/1 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 <[email protected]>
---
bitbake/lib/bb/data.py +2 -2
@@ -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