summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-08-27 22:41:22 +0000
committerZac Medico <zmedico@gentoo.org>2007-08-27 22:41:22 +0000
commitd67b34124b660af0968e517484b597a9de07b554 (patch)
tree0bb2582e9469f2127b1c93e75c6ed1676474858d
parent9005e46903e142b981ac270f351d7281c5e8b547 (diff)
downloadportage-d67b34124b660af0968e517484b597a9de07b554.tar.gz
portage-d67b34124b660af0968e517484b597a9de07b554.tar.bz2
portage-d67b34124b660af0968e517484b597a9de07b554.zip
Bug #110443 - Add a KEYWORDS.stable check for ebuilds that are added directly with stable KEYWORDS.
svn path=/main/trunk/; revision=7710
-rwxr-xr-xbin/repoman28
1 files changed, 28 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman
index 9842247c6..eded5cb55 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -151,6 +151,7 @@ qahelp={
"file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars,
"file.UTF8":"File is not UTF8 compliant",
"KEYWORDS.missing":"Ebuilds that have a missing or empty KEYWORDS variable",
+ "KEYWORDS.stable":"Ebuilds that have been added directly with stable KEYWORDS",
"KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask",
"LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable",
"DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable",
@@ -782,6 +783,13 @@ elif "--pretend" in myoptions:
elif quiet < 1:
print green("\nRepoMan scours the neighborhood...")
+new_ebuilds = set()
+if isCvs:
+ mycvstree = cvstree.getentries("./", recursive=1)
+ mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./")
+ new_ebuilds.update(x for x in mynew if x.endswith(".ebuild"))
+ del mycvstree, mynew
+
dofail = 0
arch_caches={}
arch_xmatch_caches = {}
@@ -1100,6 +1108,26 @@ for x in scanlist:
stats[myqakey]=stats[myqakey]+1
fails[myqakey].append(x+"/"+y+".ebuild")
+ keywords = myaux["KEYWORDS"].split()
+ stable_keywords = []
+ for keyword in keywords:
+ if not keyword.startswith("~") and \
+ not keyword.startswith("-"):
+ stable_keywords.append(keyword)
+ if stable_keywords:
+ ebuild_path = y + ".ebuild"
+ if repolevel < 3:
+ ebuild_path = os.path.join(pkgdir, ebuild_path)
+ if repolevel < 2:
+ ebuild_path = os.path.join(catdir, ebuild_path)
+ ebuild_path = os.path.join(".", ebuild_path)
+ if ebuild_path in new_ebuilds:
+ stable_keywords.sort()
+ stats["KEYWORDS.stable"] += 1
+ fails["KEYWORDS.stable"].append(
+ x + "/" + y + ".ebuild added with stable keywords: %s" % \
+ " ".join(stable_keywords))
+
# KEYWORDS="-*" is a stupid replacement for package.mask and screws general KEYWORDS semantics
if "-*" in myaux["KEYWORDS"].split():
haskeyword = False