From 9144faeb653b9f1dbe74c69f85cd48f26761aa2f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 1 Oct 2011 19:12:52 -0700 Subject: 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 for 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. --- pym/portage/package/ebuild/_config/KeywordsManager.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py index cd225549e..c2b834344 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 = False hastesting = False for gp in mygroups: - if gp == "*" or (gp == "-*" and len(mygroups) == 1): - writemsg(_("--- WARNING: Package '%(cpv)s' uses" - " '%(keyword)s' keyword.\n") % {"cpv": cpv, "keyword": gp}, - noiselevel=-1) - if gp == "*": - match = True + if gp == "*": + match = True + break + elif gp == "~*": + hastesting = True + for x in pgroups: + if x[:1] == "~": + match = True + break + if match: break elif gp in pgroups: match = True -- cgit v1.2.3-1-g7c22