From 07b631ab910e400cd5515f6f026deff5946dcd1f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Nov 2007 05:49:37 +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. svn path=/main/trunk/; revision=8539 --- pym/portage/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pym') 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)) -- cgit v1.2.3-1-g7c22