From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 08:38:31 +0000 (-0000)
Subject: In create_trees(), when isolating the environment of the ROOT=/ config,
X-Git-Tag: v2.2_pre1~255
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb2a8d9f250d1e0413b9e2b117e53ffea0284366;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.

svn path=/main/trunk/; revision=8785
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 204170038..1c2488e33 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6043,11 +6043,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()