1 files changed, 16 insertions, 29 deletions

diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 48ed0d72e5..5b3710f84f 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -291,17 +291,6 @@ def join_deps(deps):
             result.append(dep)
     return ", ".join(result)
 
-def extend_deps(dest, src):
-    """
-    Extend the results from explode_dep_versions by appending all of the items
-    in the second list, avoiding duplicates.
-    """
-    for dep in src:
-        if dep not in dest:
-            dest[dep] = src[dep]
-        elif dest[dep] != src[dep]:
-            dest[dep] = src[dep]
-
 def _print_trace(body, line):
     """
     Print the Environment of a Text Body
@@ -355,16 +344,14 @@ def better_exec(code, context, text, realfile = "<code>"):
         if t in [bb.parse.SkipPackage, bb.build.FuncFailed]:
             raise
 
-        logger.exception("Error executing python function in '%s'", code.co_filename)
-
-        # print the Header of the Error Message
-        logger.error("There was an error when executing a python function in: %s" % code.co_filename)
-        logger.error("Exception:%s Message:%s" % (t, value))
+        import traceback
+        exception = traceback.format_exception_only(t, value)
+        logger.error('Error executing a python function in %s:\n%s',
+                     realfile, ''.join(exception))
 
         # Strip 'us' from the stack (better_exec call)
         tb = tb.tb_next
 
-        import traceback
         textarray = text.split('\n')
         linefailed = traceback.tb_lineno(tb)
 
@@ -490,9 +477,9 @@ def sha256_file(filename):
         s.update(line)
     return s.hexdigest()
 
-# Variables which are preserved from the original environment *and* exported
-# into our worker context
-def preserved_envvars_export_list():
+def preserved_envvars_exported():
+    """Variables which are taken from the environment and placed in and exported
+    from the metadata"""
     return [
         'BB_TASKHASH',
         'HOME',
@@ -505,9 +492,9 @@ def preserved_envvars_export_list():
         'USERNAME',
     ]
 
-# Variables which are preserved from the original environment *and* exported
-# into our worker context for interactive tasks (e.g. requiring X)
-def preserved_envvars_export_interactive_list():
+def preserved_envvars_exported_interactive():
+    """Variables which are taken from the environment and placed in and exported
+    from the metadata, for interactive tasks"""
     return [
         'COLORTERM',
         'DBUS_SESSION_BUS_ADDRESS',
@@ -525,8 +512,8 @@ def preserved_envvars_export_interactive_list():
         'XDG_SESSION_COOKIE',
     ]
 
-# Variables which are preserved from the original environment into the datastore
-def preserved_envvars_list():
+def preserved_envvars():
+    """Variables which are taken from the environment and placed in the metadata"""
     v = [
         'BBPATH',
         'BB_PRESERVE_ENV',
@@ -535,7 +522,7 @@ def preserved_envvars_list():
         'LANG',
         '_',
     ]
-    return v + preserved_envvars_export_list() + preserved_envvars_export_interactive_list()
+    return v + preserved_envvars_exported() + preserved_envvars_exported_interactive()
 
 def filter_environment(good_vars):
     """
@@ -557,8 +544,8 @@ def filter_environment(good_vars):
 
     return removed_vars
 
-def create_intereactive_env(d):
-    for k in preserved_envvars_export_interactive_list():
+def create_interactive_env(d):
+    for k in preserved_envvars_exported_interactive():
         os.setenv(k, bb.data.getVar(k, d, True))
 
 def clean_environment():
@@ -570,7 +557,7 @@ def clean_environment():
         if 'BB_ENV_WHITELIST' in os.environ:
             good_vars = os.environ['BB_ENV_WHITELIST'].split()
         else:
-            good_vars = preserved_envvars_list()
+            good_vars = preserved_envvars()
         if 'BB_ENV_EXTRAWHITE' in os.environ:
             good_vars.extend(os.environ['BB_ENV_EXTRAWHITE'].split())
         filter_environment(good_vars)