diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 11:01:47 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 11:02:59 +0100 |
| commit | 843e9339c5ee3c99657a40a0e2c7dbd777b6ef06 (patch) | |
| tree | f39596d871130510770ff4f7f6408dadf0d6262d /lib/bb/utils.py | |
| parent | 73b8f4d3fbeaf1b330a66d76012d0a5cef8dbe2d (diff) | |
| download | bitbake-contrib-843e9339c5ee3c99657a40a0e2c7dbd777b6ef06.tar.gz | |
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>
Diffstat (limited to 'lib/bb/utils.py')
| -rw-r--r-- | lib/bb/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 768660243..ae3ef1054 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() |