From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 15 May 2006 02:40:19 +0000 (-0000)
Subject: Ensure that ${ROOT} is normalized for bug #90444.
X-Git-Tag: v2.1_rc2~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34fde515c94ee950e2b26e3944bbe112d5c2fb5b;p=portage.git

Ensure that ${ROOT} is normalized for bug #90444.

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

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