Patch from mainline for collision protect not to bail out on an update.

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

diff --git a/pym/portage.py b/pym/portage.py
index 93d6fecdb1dd8149316f68a9b6f9aeef6266898d..b1463405910647437e0360a6270181009045babe 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5871,7 +5871,7 @@ class dblink:
                        myslot = self.settings["SLOT"]
                        for v in otherversions:
                                # only allow versions with same slot to overwrite files
-                               if myslot == db[self.myroot]["vartree"].dbapi.aux_get(self.mycpv, ["SLOT"])[0]:
+                               if myslot == db[self.myroot]["vartree"].dbapi.aux_get("/".join((self.cat, v)), ["SLOT"])[0]:
                                        mypkglist.append(dblink(self.cat,v,destroot,self.settings))
 
                        print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"