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 199a7b618b7d9f4e58a1652951c5cc332df6c718..f49873d7b270b40b7beebfb32c9f485d22829de2 100755 (executable)
--- 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():