From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 15 May 2006 04:20:22 +0000 (-0000)
Subject: Add back the rstrip(os.path.sep) which is needed in the case where ROOT=/ (regression... 
X-Git-Tag: v2.1_rc2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a16240744addcd32e18a47db9fae5dbba30a598;p=portage.git

Add back the rstrip(os.path.sep) which is needed in the case where ROOT=/ (regression from r3356).

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

diff --git a/pym/portage.py b/pym/portage.py
index d3814f294..4cdf52208 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -968,8 +968,10 @@ class config:
 			# backupenv is for calculated incremental variables.
 			self.backupenv = os.environ.copy()
 
-			config_root = os.path.normpath(config_root) + os.path.sep
-			target_root = os.path.normpath(target_root) + os.path.sep
+			config_root = \
+				os.path.normpath(config_root).rstrip(os.path.sep) + os.path.sep
+			target_root = \
+				os.path.normpath(target_root).rstrip(os.path.sep) + os.path.sep
 
 			for k, v in (("PORTAGE_CONFIGROOT", config_root),
 				("ROOT", target_root)):