From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 7 Jun 2008 22:42:44 +0000 (-0000)
Subject: Make load_emerge_config() filter out empty PORTAGE_CONFIGROOT and ROOT
X-Git-Tag: v2.1.5.5~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2d1d49eff905e4ebb49e8d43955f52cac249cf6;p=portage.git

Make load_emerge_config() filter out empty PORTAGE_CONFIGROOT and ROOT
values, and those containing only whitespace. (trunk r10594)

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

diff --git a/bin/emerge b/bin/emerge
index 199a7b618..f49873d7b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -8743,7 +8743,9 @@ def validate_ebuild_environment(trees):
 def load_emerge_config(trees=None):
 	kwargs = {}
 	for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):
-		kwargs[k] = os.environ.get(envvar, None)
+		v = os.environ.get(envvar, None)
+		if v and v.strip():
+			kwargs[k] = v
 	trees = portage.create_trees(trees=trees, **kwargs)
 
 	for root, root_trees in trees.iteritems():