summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-15 03:06:27 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-15 03:06:27 +0000
commitf37b80c742f24fbfe601b3c04d97549f8d8191fb (patch)
treebc4c56d03f88f0c738f9a317870b9c79827d3390
parent34fde515c94ee950e2b26e3944bbe112d5c2fb5b (diff)
downloadportage-f37b80c742f24fbfe601b3c04d97549f8d8191fb.tar.gz
portage-f37b80c742f24fbfe601b3c04d97549f8d8191fb.tar.bz2
portage-f37b80c742f24fbfe601b3c04d97549f8d8191fb.zip
Revert the performance optimization from r3355 in favor of maximum robustness.
svn path=/main/trunk/; revision=3357
-rw-r--r--pym/portage.py3
1 files changed, 2 insertions, 1 deletions
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]]