From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Nov 2007 04:50:38 +0000 (-0000)
Subject: When ROOT != "/" we only want overrides from the calling
X-Git-Tag: v2.1.4~254
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=314d036e1e094af83017eca6e160e23a9520ff44;p=portage.git

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
---

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))