diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-20 05:49:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-20 05:49:37 +0000 |
| commit | 07b631ab910e400cd5515f6f026deff5946dcd1f (patch) | |
| tree | 4bac5da4595e4778f82b08d18aef4f883b6a4dce | |
| parent | fcd4033171cb07471c712d34e91d81d4eb956de6 (diff) | |
| download | portage-07b631ab910e400cd5515f6f026deff5946dcd1f.tar.gz portage-07b631ab910e400cd5515f6f026deff5946dcd1f.tar.bz2 portage-07b631ab910e400cd5515f6f026deff5946dcd1f.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.
svn path=/main/trunk/; revision=8539
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 74a6d853c..0146d8431 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5765,6 +5765,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)) |