From 8142d9cc696c9620b6e7241c6e3800f893fa6026 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 May 2008 23:19:00 +0000 Subject: [PATCH] Validate and normalize target_root earlier in the config constructor. svn path=/main/trunk/; revision=10369 --- pym/portage/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index c8902b9bb..e0d99e6e8 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1278,6 +1278,12 @@ class config(object): if target_root is None: target_root = "/" + target_root = normalize_path(os.path.abspath( + target_root)).rstrip(os.path.sep) + os.path.sep + + portage.util.ensure_dirs(target_root) + check_var_directory("ROOT", target_root) + # The expand_map is used for variable substitution # in getconfig() calls, and the getconfig() calls # update expand_map with the value of each variable @@ -1391,12 +1397,6 @@ class config(object): cfg.pop(blacklisted, None) del blacklisted, cfg - target_root = normalize_path(os.path.abspath( - target_root)).rstrip(os.path.sep) + os.path.sep - - portage.util.ensure_dirs(target_root) - check_var_directory("ROOT", target_root) - self["PORTAGE_CONFIGROOT"] = config_root self.backup_changes("PORTAGE_CONFIGROOT") self["ROOT"] = target_root -- 2.26.2