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=/. (trunk r12811)

svn path=/main/branches/2.1.6/; revision=13043

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ff86002f00dae7f3ba1702051a098add7724e599..5958badbf3106d957f53cfe0601611a878bbdd63 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7904,7 +7904,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))