From 9294b951744b5fc64dea7f10760bee0b1d8cd6f0 Mon Sep 17 00:00:00 2001 From: Robert Bradford Date: Fri, 17 Oct 2008 09:46:23 +0000 Subject: bitbake-dev: Refactor the environment variable handling. Do not clear the environment when saving the environment to the data store. Instead clear this once the cooker has forked. This ensures that the UI operates in a filtered (but not empty) environment. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5526 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake-dev/bin/bitbake | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'bitbake-dev/bin/bitbake') diff --git a/bitbake-dev/bin/bitbake b/bitbake-dev/bin/bitbake index 247b54fcd3..87284c08fe 100755 --- a/bitbake-dev/bin/bitbake +++ b/bitbake-dev/bin/bitbake @@ -141,15 +141,10 @@ Default BBFILES are the .bb files in the current directory.""" ) cooker = bb.cooker.BBCooker(configuration) - # Optionally clean up the environment - if 'BB_PRESERVE_ENV' not in os.environ: - if 'BB_ENV_WHITELIST' in os.environ: - good_vars = os.environ['BB_ENV_WHITELIST'].split() - else: - good_vars = bb.utils.preserved_envvars_list() - if 'BB_ENV_EXTRAWHITE' in os.environ: - good_vars.extend(os.environ['BB_ENV_EXTRAWHITE'].split()) - bb.utils.filter_environment(good_vars) + # Clear away any spurious environment variables. But don't wipe the + # environment totally. This is necessary to ensure the correct operation + # of the UIs (e.g. for DISPLAY, etc.) + bb.utils.clean_environment() cooker.parseConfiguration() host = cooker.server.host -- cgit v1.2.3