diff options
author | Robert Bradford <rob@openedhand.com> | 2008-10-17 09:46:35 +0000 |
---|---|---|
committer | Robert Bradford <rob@openedhand.com> | 2008-10-17 09:46:35 +0000 |
commit | 696d4f01d235b7309fd1b88bd12949927f19b5d6 (patch) | |
tree | 90c0a158e4c0f41ce8ef68989218df7a73f6d282 /bitbake/lib/bb/utils.py | |
parent | 9294b951744b5fc64dea7f10760bee0b1d8cd6f0 (diff) | |
download | poky-696d4f01d235b7309fd1b88bd12949927f19b5d6.tar.gz |
bitbake: Refactor the environment variable handling
Refactor the environment variable handling so that it more closes matches the
changes that have been made in bitbake-dev.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5527 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 18fc9f7252..0f402f6279 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -354,6 +354,28 @@ def filter_environment(good_vars): | |||
354 | 354 | ||
355 | return removed_vars | 355 | return removed_vars |
356 | 356 | ||
357 | def clean_environment(): | ||
358 | """ | ||
359 | Clean up any spurious environment variables. This will remove any | ||
360 | variables the user hasn't chose to preserve. | ||
361 | """ | ||
362 | if 'BB_PRESERVE_ENV' not in os.environ: | ||
363 | if 'BB_ENV_WHITELIST' in os.environ: | ||
364 | good_vars = os.environ['BB_ENV_WHITELIST'].split() | ||
365 | else: | ||
366 | good_vars = preserved_envvars_list() | ||
367 | if 'BB_ENV_EXTRAWHITE' in os.environ: | ||
368 | good_vars.extend(os.environ['BB_ENV_EXTRAWHITE'].split()) | ||
369 | filter_environment(good_vars) | ||
370 | |||
371 | def empty_environment(): | ||
372 | """ | ||
373 | Remove all variables from the environment. | ||
374 | """ | ||
375 | for s in os.environ.keys(): | ||
376 | os.unsetenv(s) | ||
377 | del os.environ[s] | ||
378 | |||
357 | def prunedir(topdir): | 379 | def prunedir(topdir): |
358 | # Delete everything reachable from the directory named in 'topdir'. | 380 | # Delete everything reachable from the directory named in 'topdir'. |
359 | # CAUTION: This is dangerous! | 381 | # CAUTION: This is dangerous! |