From b90061e5860d8769690ddd41e0e2f487860c85ee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 29 Jan 2010 18:46:24 +0000 Subject: [PATCH] =?utf8?q?Bug=20#269225=20-=20Warn=20about=20virtuals=20wi?= =?utf8?q?th=20non-empty=20HOMEPAGE=20or=20LICENSE.=20Thanks=20to=20Ulrich?= =?utf8?q?=20M=C3=BCller=20=20for=20this=20patch.=20(trunk=20r151?= =?utf8?q?74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/main/branches/2.1.7/; revision=15240 --- bin/repoman | 11 +++++++++++ man/repoman.1 | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/bin/repoman b/bin/repoman index b62378197..49f04c6e9 100755 --- a/bin/repoman +++ b/bin/repoman @@ -278,6 +278,7 @@ qahelp={ "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", + "LICENSE.virtual":"Virtuals that have a non-empty LICENSE variable", "DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable", "DESCRIPTION.toolong":"DESCRIPTION is over %d characters" % max_desc_len, "EAPI.definition":"EAPI is defined after an inherit call (must be defined before)", @@ -285,6 +286,7 @@ qahelp={ "EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)", "SLOT.invalid":"Ebuilds that have a missing or invalid SLOT variable value", "HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable", + "HOMEPAGE.virtual":"Virtuals that have a non-empty HOMEPAGE variable", "DEPEND.bad":"User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)", "RDEPEND.bad":"User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds)", "PDEPEND.bad":"User-visible ebuilds with bad PDEPEND settings (matched against *visible* ebuilds)", @@ -360,6 +362,8 @@ qawarnings = set(( "DEPEND.badmaskedindev","RDEPEND.badmaskedindev","PDEPEND.badmaskedindev", "DEPEND.badtilde", "RDEPEND.badtilde", "PDEPEND.badtilde", "DESCRIPTION.toolong", +"HOMEPAGE.virtual", +"LICENSE.virtual", "KEYWORDS.dropped", "KEYWORDS.stupid", "KEYWORDS.missing", @@ -1381,6 +1385,13 @@ for x in scanlist: stats[myqakey]=stats[myqakey]+1 fails[myqakey].append(x+"/"+y+".ebuild") + if catdir == "virtual": + for var in ("HOMEPAGE", "LICENSE"): + if myaux.get(var): + myqakey = var + ".virtual" + stats[myqakey] = stats[myqakey] + 1 + fails[myqakey].append(relative_path) + # 14 is the length of DESCRIPTION="" if len(myaux['DESCRIPTION']) > max_desc_len: stats['DESCRIPTION.toolong'] += 1 diff --git a/man/repoman.1 b/man/repoman.1 index ab54f5bda..3f8f1c5e6 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -119,6 +119,9 @@ Ebuilds that have an unsupported EAPI version (you must upgrade portage) .B HOMEPAGE.missing Ebuilds that have a missing or empty HOMEPAGE variable .TP +.B HOMEPAGE.virtual +Virtuals that have a non-empty HOMEPAGE variable +.TP .B IUSE.invalid This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file .TP @@ -149,6 +152,9 @@ Ebuilds that have a missing or empty LICENSE variable .B LICENSE.syntax Syntax error in LICENSE (usually an extra/missing space/parenthesis) .TP +.B LICENSE.virtual +Virtuals that have a non-empty LICENSE variable +.TP .B LIVEVCS.stable Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keywords. .TP -- 2.26.2