Revert the performance optimization from r3355 in favor of maximum robustness.

svn path=/main/trunk/; revision=3357

diff --git a/pym/portage.py b/pym/portage.py
index 46b403f02e99e7c3fe8471fe347c322ae727f152..d3814f29430a43bb2fe52b7c9aa4aed39290f56a 100644 (file)
--- 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]]