From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Mar 2009 00:05:25 +0000 (-0000)
Subject: Inside create_trees(), when cleansing the environment for the ROOT=/ config
X-Git-Tag: v2.2_rc24~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=335d83e4fd1207b01605db0ee56b93d123accdce;p=portage.git

Inside create_trees(), when cleansing the environment for the ROOT=/ config
instance, call config.reset() so that configdict['env'] is cleared as was
originally intended here. This prevents thinks like CHOST overrides from the
calling environment from inappropriately being applied to ROOT=/.

svn path=/main/trunk/; revision=12811
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9903cd820..03b9e1a30 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7917,7 +7917,7 @@ def create_trees(config_root=None, target_root=None, trees=None):
 			if k in env_d or \
 				v == backupenv.get(k):
 				backupenv.pop(k, None)
-		settings.regenerate()
+		settings.reset()
 		settings.lock()
 		myroots.append((settings["ROOT"], settings))