From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B64AC138A1A for ; Mon, 9 Feb 2015 00:45:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06512E084B; Mon, 9 Feb 2015 00:45:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A2F4E084B for ; Mon, 9 Feb 2015 00:45:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22D383406BB for ; Mon, 9 Feb 2015 00:45:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FFC1115A6 for ; Mon, 9 Feb 2015 00:45:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1423442691.21b4db4b9db1ed79d0f62e9761c29acde490fbc1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 21b4db4b9db1ed79d0f62e9761c29acde490fbc1 X-VCS-Branch: master Date: Mon, 9 Feb 2015 00:45:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e53f9242-efeb-44d6-aede-369ceee35dff X-Archives-Hash: 51fe1c907c15aa7d4f0162354e2156d3 commit: 21b4db4b9db1ed79d0f62e9761c29acde490fbc1 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 9 00:44:51 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 9 00:44:51 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=21b4db4b repoman: fix overlay mask logic for bug #539402 In repoman, portdb.xmatch("match-visible", pkg.cp) was used to check the list of visible ebuilds. However, instead of pkg.cp, when checking an overlay it needs use an atom which restricts the match to the appropriate repo. Otherwise, it risks matching ebuilds from the master repo(s). X-Gentoo-Bug: 539402 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=539402 Acked-by: Brian Dolbec gentoo.org> --- bin/repoman | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/repoman b/bin/repoman index 5380146..0bf576f 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2319,7 +2319,8 @@ for x in effective_scanlist: if not baddepsyntax: ismasked = not ebuild_archs or \ - pkg.cpv not in portdb.xmatch("match-visible", pkg.cp) + pkg.cpv not in portdb.xmatch("match-visible", + Atom("%s::%s" % (pkg.cp, repo_config.name))) if ismasked: if not have_pmasked: have_pmasked = bool(dep_settings._getMaskAtom(