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 bafb66a39bc58dfa9d3685b6ff867f55dc347ba5..bc482de9d8a6297735bf1c18c21d6f234d8303aa 100644 (file)
--- 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: