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

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

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1b5de6641..65de5aeea 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8842,7 +8842,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():