Fix collision-protect logic so the correct cpv is used for slot comparison.

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

diff --git a/pym/portage.py b/pym/portage.py
index 547085c244580f8c8bf7c07577e3da2f7a031454..8325944313a4d1f4d6b18e908c6adf04c5deff5f 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5730,7 +5730,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(v.mycpv, ["SLOT"])[0]:
                                        mypkglist.append(dblink(self.cat,v,destroot,self.settings))
 
                        print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"