From c92dbaba4e0e067311fa98e06fcdeab6a017362f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 25 Aug 2011 18:42:59 +0200 Subject: [PATCH] [entropy] add KEYWORDS validation in packages.server.qa.exec --- .../entropy/packages/packages.server.qa.exec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/intel/entropy/packages/packages.server.qa.exec b/conf/intel/entropy/packages/packages.server.qa.exec index 6149b68..113f1db 100755 --- a/conf/intel/entropy/packages/packages.server.qa.exec +++ b/conf/intel/entropy/packages/packages.server.qa.exec @@ -24,6 +24,7 @@ # PKG_LICENSE = package license # PKG_BRANCH = package license # PKG_DOWNLOAD = package relative download URL +# PKG_KEYWORDS = package keywords, space separated # PKG_MD5 = package file md5 hash # PKG_SLOT = package slot # PKG_ETPAPI = package Entropy API @@ -56,6 +57,7 @@ def check_unwanted_deps(): if pkg_deps is None: return 0 pkg_atom = os.getenv("PKG_ATOM") + pkg_keywords = os.getenv("PKG_KEYWORDS") unwanted_deps = ["app-admin/packagekit", "app-text/poppler", "kde-base/kde-l10n", "net-dns/avahi", "net-p2p/transmission", @@ -80,7 +82,18 @@ def check_unwanted_deps(): sys.stderr.write("%s contains a weirdo dependency against %s\n" % ( pkg_atom, pkg_deps[warning_dep])) sys.stderr.write("ATTENTION ATTENTION ATTENTION\n\n") - func_rc = 1 + if func_rc == 0: + func_rc = 1 + + if pkg_keywords is not None: + keywords = pkg_keywords.split() + if not keywords or ("**" in keywords and len(keywords) == 1): + sys.stderr.write("\nATTENTION ATTENTION ATTENTION\n") + sys.stderr.write("%s is masked by default, keywords: %s\n" % ( + pkg_atom, pkg_keywords)) + sys.stderr.write("ATTENTION ATTENTION ATTENTION\n\n") + if func_rc == 0: + func_rc = 1 return func_rc