From: Zac Medico Date: Fri, 14 Apr 2006 08:01:28 +0000 (-0000) Subject: Fix collision-protect logic so the correct cpv is used for slot comparison. X-Git-Tag: v2.1_pre9~24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61629ca8d68a2afb722c9078b7c75f22277c3e9f;p=portage.git 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 547085c24..832594431 100644 --- 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"