From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 08:39:33 +0000 (-0000)
Subject: In create_trees(), when isolating the environment of the ROOT=/ config,
X-Git-Tag: v2.1.4~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70febaa9a8cd683ed00fa6643599d463150770e1;p=portage.git

In create_trees(), when isolating the environment of the ROOT=/ config,
use it's env.d keys as a blacklist to make env.d override the calling
environment. (trunk r8785)

svn path=/main/branches/2.1.2/; revision=8786
---

diff --git a/pym/portage.py b/pym/portage.py
index 75ba2aa14..77b7d0baf 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -9674,11 +9674,13 @@ def create_trees(config_root=None, target_root=None, trees=None):
 
 		backupenv_whitelist = settings._environ_whitelist
 		backupenv = settings.configdict["backupenv"]
+		env_d = settings.configdict["env.d"]
 		for k, v in os.environ.iteritems():
 			if k in backupenv_whitelist:
 				continue
-			if v == backupenv.get(k):
-				del backupenv[k]
+			if k in env_d or \
+				v == backupenv.get(k):
+				backupenv.pop(k, None)
 		settings.regenerate()
 		settings.lock()
 		settings.validate()