bitbake: Sync with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5350 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 6 insertions, 1 deletions

diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index a2d0da29ea..ceb7e648b7 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -54,6 +54,11 @@ Changes in BitBake 1.8.x:
         - Fix PACKAGES_DYNAMIC handling of packages with '++' in the name
         - Rename __depends to __base_depends after configuration parsing so we don't
           recheck the validity of the config files time after time
+        - Add better environmental variable handling. By default it will now only pass certain 
+          whitelisted variables into the data store. If BB_PRESERVE_ENV is set bitbake will use
+          all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be
+          used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used
+          to extend the internal whitelist.
 
 Changes in BitBake 1.8.10:
         - Psyco is available only for x86 - do not use it on other architectures.
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 3c1fd31b03..7b0fc40d11 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -176,7 +176,7 @@ def better_exec(code, context, text, realfile):
             raise
 
         # print the Header of the Error Message
-        bb.msg.error(bb.msg.domain.Util, "Error in executing: ", realfile)
+        bb.msg.error(bb.msg.domain.Util, "Error in executing: %s" % realfile)
         bb.msg.error(bb.msg.domain.Util, "Exception:%s Message:%s" % (t,value) )
 
         # let us find the line number now