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 1RABZH-000817-Bp for garchives@archives.gentoo.org; Sun, 02 Oct 2011 02:14:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4FEAE006E; Sun, 2 Oct 2011 02:14:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A53BAE0384 for ; Sun, 2 Oct 2011 02:14:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CCE11B4005 for ; Sun, 2 Oct 2011 02:14:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 254E180042 for ; Sun, 2 Oct 2011 02:14:03 +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: <9144faeb653b9f1dbe74c69f85cd48f26761aa2f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/_config/KeywordsManager.py X-VCS-Directories: pym/portage/package/ebuild/_config/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9144faeb653b9f1dbe74c69f85cd48f26761aa2f Date: Sun, 2 Oct 2011 02:14:03 +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: X-Archives-Hash: d9d0036f3fb1f95d0cf66223ce6c8f84 commit: 9144faeb653b9f1dbe74c69f85cd48f26761aa2f Author: Zac Medico gentoo org> AuthorDate: Sun Oct 2 02:12:52 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 2 02:12:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9144faeb KeywordsManager: support ~* in KEYWORDS This allows ~* in KEYWORDS to be match by any unstable keyword in the user's configuration, similar to how * in KEYWORDS already matches any user configuration. Thanks to Daniel Robbins funtoo.org> f= or the suggestion. Also, the warning about * or -* in KEYWORDS is now gone, so that ebuilds from the funtoo tree will be usable without triggering warnings like this. If necessary, we can add ways to selectively enable these kinds of warnings via layout.conf and/or repos.conf. --- .../package/ebuild/_config/KeywordsManager.py | 16 ++++++++++----= -- 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/= portage/package/ebuild/_config/KeywordsManager.py index cd22554..c2b8343 100644 --- a/pym/portage/package/ebuild/_config/KeywordsManager.py +++ b/pym/portage/package/ebuild/_config/KeywordsManager.py @@ -206,12 +206,16 @@ class KeywordsManager(object): hasstable =3D False hastesting =3D False for gp in mygroups: - if gp =3D=3D "*" or (gp =3D=3D "-*" and len(mygroups) =3D=3D 1): - writemsg(_("--- WARNING: Package '%(cpv)s' uses" - " '%(keyword)s' keyword.\n") % {"cpv": cpv, "keyword": gp}, - noiselevel=3D-1) - if gp =3D=3D "*": - match =3D True + if gp =3D=3D "*": + match =3D True + break + elif gp =3D=3D "~*": + hastesting =3D True + for x in pgroups: + if x[:1] =3D=3D "~": + match =3D True + break + if match: break elif gp in pgroups: match =3D True