From 577687384aa61f5026e05a8eecd79634cfc77bc4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 15 Mar 2007 20:27:25 +0000 Subject: Add back rstrip(os.path.sep) from the previous commit since it's needed when ROOT="/". svn path=/main/trunk/; revision=6211 --- pym/portage/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8dbc3bbe7..129804632 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -926,8 +926,8 @@ class config: if config_root is None: config_root = "/" - config_root = \ - normalize_path(os.path.abspath(config_root)) + os.path.sep + config_root = normalize_path(os.path.abspath( + config_root)).rstrip(os.path.sep) + os.path.sep check_var_directory("PORTAGE_CONFIGROOT", config_root) @@ -1178,8 +1178,8 @@ class config: if target_root is None: target_root = "/" - target_root = \ - normalize_path(os.path.abspath(target_root)) + os.path.sep + target_root = normalize_path(os.path.abspath( + target_root)).rstrip(os.path.sep) + os.path.sep check_var_directory("ROOT", target_root) -- cgit v1.2.3-1-g7c22