From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SQiFn-0005sx-2Q for garchives@archives.gentoo.org; Sat, 05 May 2012 16:54:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6139E097B; Sat, 5 May 2012 16:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A85CCE097B for ; Sat, 5 May 2012 16:54:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 188A21B4020 for ; Sat, 5 May 2012 16:54:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CF865E5403 for ; Sat, 5 May 2012 16:54:28 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1336236854.d448e1f1844fe1fe8b865f8f9080206b84c6f4e3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d448e1f1844fe1fe8b865f8f9080206b84c6f4e3 X-VCS-Branch: master Date: Sat, 5 May 2012 16:54:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7e91d3c8-4581-4aeb-a2b4-ddd5c1420048 X-Archives-Hash: 7cbf170fc20625aa94947c38b1ba8787 commit: d448e1f1844fe1fe8b865f8f9080206b84c6f4e3 Author: Zac Medico gentoo org> AuthorDate: Sat May 5 16:54:14 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 5 16:54:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd448e1f1 COLLISION_IGNORE: handle prefix --- 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 71b5d80..ee77fac 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 =3D True if not isowned: + f_match =3D full_path[len(self._eroot)-1:] stopmerge =3D True if collision_ignore: - if f in collision_ignore: + if f_match in collision_ignore: stopmerge =3D False else: for myignore in collision_ignore: - if f.startswith(myignore + os.path.sep): + if f_match.startswith(myignore + os.path.sep): stopmerge =3D False break for pattern in unowned_ignore_patterns: - if fnmatch.fnmatch(f, pattern): + if fnmatch.fnmatch(f_match, pattern): stopmerge =3D False break if stopmerge: