From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 13 Oct 2006 17:37:02 +0000 (-0000)
Subject: Patch from mainline for collision protect not to bail out on an update.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=220f271fdd1f05bcae76f0df5d1a30158dff8100;p=portage.git

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 93d6fecdb..b14634059 100644
--- 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"