diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-08-12 17:58:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 09:49:37 +0100 |
commit | 61d83c6d6b23ea0fa3f99dfb53bf47c727c5a1c6 (patch) | |
tree | cbddb0ea6bd9505fc99eb8500b27980d65b9bd59 /bitbake/bin | |
parent | a6c48298b17e6a5844b3638b422fe226e3b67b89 (diff) | |
download | ast2050-yocto-poky-61d83c6d6b23ea0fa3f99dfb53bf47c727c5a1c6.zip ast2050-yocto-poky-61d83c6d6b23ea0fa3f99dfb53bf47c727c5a1c6.tar.gz |
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 <james.limbouris@gmail.com>
CC: Chris Larson <clarson@kergoth.com>
(Bitbake rev: cb6c07054e8baf94614713ec257c643b22266d75)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake-layers | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 88fb8ea..119b15c 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, |