From f6247cc2eda91a5f8ebf1b9df40f424b8c429284 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 16 Jul 2008 08:34:04 +0000 Subject: [PATCH] Do not check config_root + prefix, if we explicitly set PORTAGE_CONFIGROOT we mean that dir, not the Prefix variant svn path=/main/branches/prefix/; revision=11074 --- pym/portage/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 241e74f64..fbd3d1950 100644 --- 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 -- 2.26.2