From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 11 Sep 2013 10:01:47 +0000 (+0100)
Subject: utils: Fix BB_PRESERVE_ENV
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=843e9339c5ee3c99657a40a0e2c7dbd777b6ef06;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

utils: Fix BB_PRESERVE_ENV

BB_PRESERVE_ENV wasn't working since data.inheritFromOS wasn't getting a
correct list of keys to import into the data store. This fixes
things so it does add all environment variables into the data store
when BB_PRESERVE_ENV is used.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 7686602432e..ae3ef1054b5 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -532,6 +532,8 @@ def approved_variables():
     Determine and return the list of whitelisted variables which are approved
     to remain in the envrionment.
     """
+    if 'BB_PRESERVE_ENV' in os.environ:
+        return os.environ.keys()
     approved = []
     if 'BB_ENV_WHITELIST' in os.environ:
         approved = os.environ['BB_ENV_WHITELIST'].split()