From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 15 Mar 2007 20:27:25 +0000 (-0000)
Subject: Add back rstrip(os.path.sep) from the previous commit since it's needed when ROOT... 
X-Git-Tag: v2.2_pre1~1584
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=577687384aa61f5026e05a8eecd79634cfc77bc4;p=portage.git

Add back rstrip(os.path.sep) from the previous commit since it's needed when ROOT="/".

svn path=/main/trunk/; revision=6211
---

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)