diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-05-05 09:54:14 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-05 09:54:14 -0700 |
| commit | d448e1f1844fe1fe8b865f8f9080206b84c6f4e3 (patch) | |
| tree | 6d26e59affb523fd799afccf186bda1463713e7a /pym/portage/dbapi | |
| parent | COLLISION_IGNORE_UNOWNED: tweak default *.py[co] (diff) | |
| download | portage-d448e1f1844fe1fe8b865f8f9080206b84c6f4e3.tar.gz portage-d448e1f1844fe1fe8b865f8f9080206b84c6f4e3.tar.bz2 portage-d448e1f1844fe1fe8b865f8f9080206b84c6f4e3.zip | |
COLLISION_IGNORE: handle prefix
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 7 |
1 files changed, 4 insertions, 3 deletions
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: |