From 696d4f01d235b7309fd1b88bd12949927f19b5d6 Mon Sep 17 00:00:00 2001 From: Robert Bradford Date: Fri, 17 Oct 2008 09:46:35 +0000 Subject: 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 --- bitbake/bin/bitbake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'bitbake/bin/bitbake') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index dc35152d57..9a9b6d3bc6 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -113,15 +113,9 @@ 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. + bb.utils.clean_environment() cooker.parseConfiguration() -- cgit 1.2.3-korg