diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:41:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:41:09 +0000 |
| commit | 976231854d1bddfd6df1ce7c302c31481f4cc37f (patch) | |
| tree | e0e8d5d54d50c9aeebb3e901636f43cde91b48c0 /pym | |
| parent | bfc9eb64b1ffb5801b40b0785e2458cc112dc1a1 (diff) | |
| download | portage-976231854d1bddfd6df1ce7c302c31481f4cc37f.tar.gz portage-976231854d1bddfd6df1ce7c302c31481f4cc37f.tar.bz2 portage-976231854d1bddfd6df1ce7c302c31481f4cc37f.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index ff86002f0..5958badbf 100644 --- 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)) |