diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/data.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 7ad1acad1c..54b2615afb 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -370,9 +370,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): if type(val) is not types.StringType: return 0 - if getVarFlag(var, 'matchesenv', d): - return 0 - 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 @@ -382,6 +379,9 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): o.write('unset %s\n' % varExpanded) return 1 + if getVarFlag(var, 'matchesenv', d): + return 0 + val.rstrip() if not val: return 0 |