summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-15 20:27:25 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-15 20:27:25 +0000
commit577687384aa61f5026e05a8eecd79634cfc77bc4 (patch)
tree823762d47184f2542e1ffca93dab6639f5eddca8
parent3d58062f5f990f9ba34620e5560fd06b04c42561 (diff)
downloadportage-577687384aa61f5026e05a8eecd79634cfc77bc4.tar.gz
portage-577687384aa61f5026e05a8eecd79634cfc77bc4.tar.bz2
portage-577687384aa61f5026e05a8eecd79634cfc77bc4.zip
Add back rstrip(os.path.sep) from the previous commit since it's needed when ROOT="/".
svn path=/main/trunk/; revision=6211
-rw-r--r--pym/portage/__init__.py8
1 files 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)