terminal: fix issue with unset exportable env vars

This should resolve the devshell issue people are seeing.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index 41230466c4188c39d7ed3c6ed1c885b9c9150be1..f29aeb0e12c26d9873ff6e6384813b15d533cb99 100644 (file)
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -30,7 +30,9 @@ def oe_terminal(command, title, d):
 
     env = dict(os.environ)
     for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
-        env[export] = d.getVar(export, True)
+        value = d.getVar(export, True)
+        if value is not None:
+            env[export] = str(value)
 
     try:
         oe.terminal.spawn_preferred(command, title, env)