[patch] Warn if FEATURES contains unknown values and don't keep them

0001-Warn-if-FEATURES-contains-unknown-values-and-don-t-k.patch (text/plain), 2.85 KB, created by Sebastian Luther (few) on 2010-07-03 19:39:14 UTC

From a9622760db37ba00f1db3571e4cd3e2e10afa47c Mon Sep 17 00:00:00 2001
From: Sebastian Luther <[e-mail]>
Date: Sat, 3 Jul 2010 12:58:21 +0200
Subject: [PATCH] Warn if FEATURES contains unknown values and don't keep them

---
 pym/portage/const.py                 |   13 +++++++++++++
 pym/portage/package/ebuild/config.py |   14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 445677b..f1997ba 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -82,6 +82,19 @@ EBUILD_PHASES            = ("pretend", "setup", "unpack", "prepare", "configure"
                            "compile", "test", "install",
                            "package", "preinst", "postinst","prerm", "postrm",
                            "nofetch", "config", "info", "other")
+SUPPORTED_FEATURES       = ("assume-digests", "buildpkg", "buildsyspkg", "ccache",
+                           "collision-protect", "digest", "distcc", "distlocks",
+                           "fakeroot", "fail-clean", "fixpackages", "getbinpkg",
+                           "installsources", "keeptemp", "keepwork", "lmirror",
+                           "metadata-transfer", "mirror", "multilib-strict", "news",
+                           "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip"
+                           "notitles", "parallel-fetch", "parse-eapi-ebuild-head",
+                           "parse-eapi-glep-55", "preserve-libs", "protect-owned",
+                           "python-trace", "sandbox", "sesandbox", "severe", "sfperms",
+                           "sign", "skiprocheck", "split-elog", "split-log", "splitdebug",
+                           "strict", "stricter", "suidctl", "test", "test-fail-continue",
+                           "unmerge-logs", "unmerge-orphans", "userfetch", "userpriv",
+                           "usersandbox", "usersync", "webrsync-gpg")
 
 EAPI                     = 3
 
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 57bbdd5..466d50e 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -2186,10 +2186,22 @@ class config(object):
 						myflags = []
 						continue
 
+					if mykey == "FEATURES":
+						if x.startswith(("+", "-")):
+							val = x[1:]
+						else:
+							val = x
+
+						if val not in portage.const.SUPPORTED_FEATURES:
+							writemsg(colorize("BAD",
+								_("FEATURES variable contains an unknown value: %s") % x) \
+								+ "\n", noiselevel=-1)
+							continue
+
 					if x[0]=="+":
 						# Not legal. People assume too much. Complain.
 						writemsg(colorize("BAD",
-							_("USE flags should not start with a '+': %s") % x) \
+							_("%s values should not start with a '+': %s") % (mykey,x)) \
 							+ "\n", noiselevel=-1)
 						x=x[1:]
 						if not x:
-- 
1.7.1