From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 5 May 2012 16:54:14 +0000 (-0700)
Subject: COLLISION_IGNORE: handle prefix
X-Git-Tag: v2.2.0_alpha102~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d448e1f1844fe1fe8b865f8f9080206b84c6f4e3;p=portage.git

COLLISION_IGNORE: handle prefix
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 71b5d80e7..ee77fac4f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3183,17 +3183,18 @@ class dblink(object):
 				if not isowned and self.isprotected(full_path):
 					isowned = True
 				if not isowned:
+					f_match = full_path[len(self._eroot)-1:]
 					stopmerge = True
 					if collision_ignore:
-						if f in collision_ignore:
+						if f_match in collision_ignore:
 							stopmerge = False
 						else:
 							for myignore in collision_ignore:
-								if f.startswith(myignore + os.path.sep):
+								if f_match.startswith(myignore + os.path.sep):
 									stopmerge = False
 									break
 					for pattern in unowned_ignore_patterns:
-						if fnmatch.fnmatch(f, pattern):
+						if fnmatch.fnmatch(f_match, pattern):
 							stopmerge = False
 							break
 					if stopmerge: