Do not check config_root + prefix, if we explicitly set PORTAGE_CONFIGROOT we mean...

svn path=/main/branches/prefix/; revision=11074

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 241e74f64fa453e95e3bd1de902dfe7cb20f09d3..fbd3d1950cf3066c4953eb9d86a8a794ce38d40f 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1140,7 +1140,7 @@ class config(object):
                        config_root = normalize_path(os.path.abspath(
                                config_root)).rstrip(os.path.sep) + os.path.sep
 
-                       check_var_directory("PORTAGE_CONFIGROOT", config_root + EPREFIX_LSTRIP)
+                       check_var_directory("PORTAGE_CONFIGROOT", config_root)
 
                        self.depcachedir = DEPCACHE_PATH
 
@@ -1301,7 +1301,7 @@ class config(object):
                                target_root)).rstrip(os.path.sep) + os.path.sep
 
                        portage.util.ensure_dirs(target_root + EPREFIX_LSTRIP)
-                       check_var_directory("ROOT", target_root + EPREFIX_LSTRIP)
+                       check_var_directory("EROOT", target_root + EPREFIX_LSTRIP)
 
                        # The expand_map is used for variable substitution
                        # in getconfig() calls, and the getconfig() calls