From 61d83c6d6b23ea0fa3f99dfb53bf47c727c5a1c6 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 12 Aug 2011 17:58:11 -0700 Subject: Ensure only the filtered environment variables are inherited from the OS The recent change which modified inheritFromOS to use the intial environment, rather than the current environment, introduced a bug such that variables which had been cleaned from the environment where still set in the data store. This patch changes things such that a list of approved environment variables is saved after the environment is cleaned and only the variables in this list are inherited in inheritFromOS. CC: James Limbouris CC: Chris Larson (Bitbake rev: cb6c07054e8baf94614713ec257c643b22266d75) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/bin/bitbake-layers') diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 88fb8ea939..119b15c172 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -31,9 +31,10 @@ def main(args): console.setFormatter(format) logger.addHandler(console) + initialenv = os.environ.copy() bb.utils.clean_environment() - cmds = Commands() + cmds = Commands(initialenv) if args: cmds.onecmd(' '.join(args)) else: @@ -42,9 +43,8 @@ def main(args): class Commands(cmd.Cmd): - def __init__(self): + def __init__(self, initialenv): cmd.Cmd.__init__(self) - initialenv = os.environ.copy() self.returncode = 0 self.config = Config(parse_only=True) self.cooker = bb.cooker.BBCooker(self.config, -- cgit v1.2.3-54-g00ecf