1 files changed, 2 insertions, 4 deletions

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))