From 15248f3e7d293502e1b7e21bcebef8c800de847e Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 20 Apr 2010 13:44:06 -0700 Subject: Allow emission of non-string objects in emit_var, instead running str() on it first (Bitbake rev: 5b09e28cb4a2c6c99ad58e71fb803160922a7e1e) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 3ff1ac8119..2d04b010cd 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -194,9 +194,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): if all: o.write('# %s=%s\n' % (var, oval)) - if not isinstance(val, basestring): - 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 @@ -206,10 +203,11 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): o.write('unset %s\n' % varExpanded) return 1 - val.rstrip() if not val: return 0 + val = str(val) + if func: # NOTE: should probably check for unbalanced {} within the var o.write("%s() {\n%s\n}\n" % (varExpanded, val)) -- cgit v1.2.3-54-g00ecf