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 1b5de66419ac7a461be1702eb1ead3a7a6d149fd..65de5aeea84de6d2145dbe5ccb57126cf5aec116 100644 (file)
--- 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():