From 91ce21d28a2a84c825bc3094f3b9179b51923631 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 20:13:24 +0000 Subject: [PATCH] When creating a config instance for ROOT=/ with a clean env, copy PATH and TERM variables, since they may be useful. (trunk r15345) svn path=/main/branches/2.1.7/; revision=15572 --- pym/portage/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e7667e131..0708aead8 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -9195,8 +9195,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)) -- 2.26.2