| 1 |
commit: 21b4db4b9db1ed79d0f62e9761c29acde490fbc1 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 9 00:44:51 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 9 00:44:51 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=21b4db4b |
| 7 |
|
| 8 |
repoman: fix overlay mask logic for bug #539402 |
| 9 |
|
| 10 |
In repoman, portdb.xmatch("match-visible", pkg.cp) was used to check the |
| 11 |
list of visible ebuilds. However, instead of pkg.cp, when checking an |
| 12 |
overlay it needs use an atom which restricts the match to the |
| 13 |
appropriate repo. Otherwise, it risks matching ebuilds from the master |
| 14 |
repo(s). |
| 15 |
|
| 16 |
X-Gentoo-Bug: 539402 |
| 17 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=539402 |
| 18 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 19 |
|
| 20 |
--- |
| 21 |
bin/repoman | 3 ++- |
| 22 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/bin/repoman b/bin/repoman |
| 25 |
index 5380146..0bf576f 100755 |
| 26 |
--- a/bin/repoman |
| 27 |
+++ b/bin/repoman |
| 28 |
@@ -2319,7 +2319,8 @@ for x in effective_scanlist: |
| 29 |
|
| 30 |
if not baddepsyntax: |
| 31 |
ismasked = not ebuild_archs or \ |
| 32 |
- pkg.cpv not in portdb.xmatch("match-visible", pkg.cp) |
| 33 |
+ pkg.cpv not in portdb.xmatch("match-visible", |
| 34 |
+ Atom("%s::%s" % (pkg.cp, repo_config.name))) |
| 35 |
if ismasked: |
| 36 |
if not have_pmasked: |
| 37 |
have_pmasked = bool(dep_settings._getMaskAtom( |
Archives