Fix collision-protect being broken; don't prefix CONTENTS entries, as

they already contain the prefix.

svn path=/main/branches/prefix/; revision=4715

diff --git a/pym/portage.py b/pym/portage.py
index 278fabfa6452955bce16458632b302b326783392..9ae3dd97b2328caef534bb5dc0c672d251ce6cd6 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6077,6 +6077,7 @@ class dblink:
                # secondhand = list of symlinks that have been skipped due to
                #              their target not existing (will merge later),
 
+               origroot = destroot
                destroot = normalize_path(destroot + portage_const.EPREFIX)
 
                if not os.path.isdir(srcroot):
@@ -6120,8 +6121,12 @@ class dblink:
                        for v in otherversions:
                                # only allow versions with same slot to overwrite files
                                if myslot == self.vartree.dbapi.aux_get("/".join((self.cat, v)), ["SLOT"])[0]:
+                                       # dblink needs the original destroot, as it prefixes
+                                       # the entries from CONTENTS in vdb with root.  So to
+                                       # avoid a double prefix there, we don't need a
+                                       # prefixed root.
                                        mypkglist.append(
-                                               dblink(self.cat, v, destroot, self.settings,
+                                               dblink(self.cat, v, origroot, self.settings,
                                                        vartree=self.vartree))
 
                        print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"