From f37b80c742f24fbfe601b3c04d97549f8d8191fb Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 15 May 2006 03:06:27 +0000
Subject: Revert the performance optimization from r3355 in favor of maximum
 robustness.

svn path=/main/trunk/; revision=3357
---
 pym/portage.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/portage.py b/pym/portage.py
index 46b403f02..d3814f294 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5670,7 +5670,8 @@ class dblink:
 			# we do this so we can remove from non-root filesystems
 			# (use the ROOT var to allow maintenance on other partitions)
 			try:
-				mydat[1] = self.myroot + mydat[1][1:]
+				mydat[1] = os.normpath(os.path.join(
+					self.myroot, mydat[1].lstrip(os.path.sep)))
 				if mydat[0]=="obj":
 					#format: type, mtime, md5sum
 					pkgfiles[string.join(mydat[1:-2]," ")]=[mydat[0], mydat[-1], mydat[-2]]
-- 
cgit v1.2.3-1-g7c22