diff options
author | 2010-04-20 13:44:06 -0700 | |
---|---|---|
committer | 2010-04-20 16:09:30 -0700 | |
commit | 5b09e28cb4a2c6c99ad58e71fb803160922a7e1e (patch) | |
tree | 8225d6c671c5209bbddeee664030fb3725a77a17 /lib/bb/data.py | |
parent | db718ec6f67c7c0d0efb4ba0b5b24384f707dcf5 (diff) | |
download | bitbake-5b09e28cb4a2c6c99ad58e71fb803160922a7e1e.tar.gz |
Allow emission of non-string objects in emit_var, instead running str() on it first
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib/bb/data.py')
-rw-r--r-- | lib/bb/data.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index 3ff1ac811..2d04b010c 100644 --- a/lib/bb/data.py +++ b/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)) |