From 314d036e1e094af83017eca6e160e23a9520ff44 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Nov 2007 04:50:38 +0000 Subject: 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 --- pym/portage.py | 7 +++++++ 1 file changed, 7 insertions(+) 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)) -- cgit v1.2.3-1-g7c22