diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-21 04:50:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-21 04:50:38 +0000 |
| commit | 314d036e1e094af83017eca6e160e23a9520ff44 (patch) | |
| tree | a5559f75943f14cd1343126544df650af89eea84 | |
| parent | a50a1bda0e6fa8dcc1626a4fcb714755765169f0 (diff) | |
| download | portage-314d036e1e094af83017eca6e160e23a9520ff44.tar.gz portage-314d036e1e094af83017eca6e160e23a9520ff44.tar.bz2 portage-314d036e1e094af83017eca6e160e23a9520ff44.zip | |
When ROOT != "/" we only want overrides from the calling
environment to apply to the config that's associated
with ROOT != "/", so we wipe out the "backupenv" for the
config that is associated with ROOT == "/" and regenerate
it's incrementals. Thanks to solar for the suggestion.
(trunk r8539)
svn path=/main/branches/2.1.2/; revision=8571
| -rw-r--r-- | pym/portage.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index bf4aacdd5..6189bfe89 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -9249,6 +9249,13 @@ def create_trees(config_root=None, target_root=None, trees=None): if settings["ROOT"] != "/": settings = config(config_root=None, target_root=None, config_incrementals=portage_const.INCREMENTALS) + # When ROOT != "/" we only want overrides from the calling + # environment to apply to the config that's associated + # with ROOT != "/", so we wipe out the "backupenv" for the + # config that is associated with ROOT == "/" and regenerate + # it's incrementals. + settings.configdict["backupenv"].clear() + settings.regenerate() settings.lock() settings.validate() myroots.append((settings["ROOT"], settings)) |