From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 15 Oct 2006 10:00:33 +0000 (-0000)
Subject: Fix for collision-protect to look into the prefix, and also to report on
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=983653bfc171a65475b29d41021565c4048a2a3e;p=portage.git

Fix for collision-protect to look into the prefix, and also to report on
files including the prefix, not to confuse people.


svn path=/main/branches/prefix/; revision=4709
---

diff --git a/pym/portage.py b/pym/portage.py
index bafb66a39..bc482de9d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6134,11 +6134,11 @@ class dblink:
 					f="/"+f
 				isowned = False
 				for ver in [self]+mypkglist:
-					if (ver.isowner(f, destroot) or ver.isprotected(f)):
+					if (ver.isowner(f, destroot + portage_const.EPREFIX) or ver.isprotected(f)):
 						isowned = True
 						break
 				if not isowned:
-					print "existing file "+f+" is not owned by this package"
+					print "existing file "+ portage_const.EPREFIX + f +" is not owned by this package"
 					stopmerge=True
 					if collision_ignore:
 						if f in collision_ignore: