diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-10 00:05:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-10 00:05:25 +0000 |
| commit | 335d83e4fd1207b01605db0ee56b93d123accdce (patch) | |
| tree | a2fa94859b36c17c25c094978275b4f263704990 | |
| parent | a3d21d02684e255c2ded0be391d21b30c83c671b (diff) | |
| download | portage-335d83e4fd1207b01605db0ee56b93d123accdce.tar.gz portage-335d83e4fd1207b01605db0ee56b93d123accdce.tar.bz2 portage-335d83e4fd1207b01605db0ee56b93d123accdce.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=/.
svn path=/main/trunk/; revision=12811
| -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 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)) |