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 9903cd820bd02eb1bec6134fca75c498d270f56e..03b9e1a30c3318a34ad2020da8252b00ea80498e 100644 (file)
--- 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))