From bfe6473628a3cca0dfc401f94997baba0267ca15 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 Feb 2010 09:09:06 +0000 Subject: When creating a config instance for ROOT=/ with a clean env, copy PATH and TERM variables, since they may be useful. svn path=/main/trunk/; revision=15345 --- pym/portage/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0879b9b9d..381701b60 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -9198,8 +9198,13 @@ def create_trees(config_root=None, target_root=None, trees=None): # When ROOT != "/" we only want overrides from the calling # environment to apply to the config that's associated - # with ROOT != "/", so pass an empty dict for the env parameter. - settings = config(config_root=None, target_root="/", env={}) + # with ROOT != "/", so pass a nearly empty dict for the env parameter. + clean_env = {} + for k in ('PATH', 'TERM'): + v = settings.get(k) + if v is not None: + clean_env[k] = v + settings = config(config_root=None, target_root="/", env=clean_env) settings.lock() myroots.append((settings["ROOT"], settings)) -- cgit v1.2.3-1-g7c22