From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4ED77138010 for ; Wed, 31 Oct 2012 21:32:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BD41E02CE; Wed, 31 Oct 2012 21:32:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 478E3E02CE for ; Wed, 31 Oct 2012 21:32:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BDDD33D855 for ; Wed, 31 Oct 2012 21:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C322CE5436 for ; Wed, 31 Oct 2012 21:32:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1351719035.658c0fd5940b9547cbdf09d4d4ea6552cfbd542a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman man/repoman.1 X-VCS-Directories: man/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 658c0fd5940b9547cbdf09d4d4ea6552cfbd542a X-VCS-Branch: master Date: Wed, 31 Oct 2012 21:32:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 45ae2c90-c83c-4acd-8d48-eb3005b7be6d X-Archives-Hash: 9622d8152914c68fbee9e5814ac93a70 commit: 658c0fd5940b9547cbdf09d4d4ea6552cfbd542a Author: Ulrich Müller gentoo org> AuthorDate: Wed Oct 31 17:42:20 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 31 21:30:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=658c0fd5 repoman: add check for deprecated licenses, bug 440638 --- bin/repoman | 12 ++++++++++++ man/repoman.1 | 5 ++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index 1502d6b..553b1d2 100755 --- a/bin/repoman +++ b/bin/repoman @@ -359,6 +359,7 @@ qahelp={ "IUSE.invalid":"This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file", "IUSE.missing":"This ebuild has a USE conditional which references a flag that is not listed in IUSE", "LICENSE.invalid":"This ebuild is listing a license that doesnt exist in portages license/ dir.", + "LICENSE.deprecated":"This ebuild is listing a deprecated license.", "KEYWORDS.invalid":"This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for which no valid profile was found", "RDEPEND.implicit":"RDEPEND is unset in the ebuild which triggers implicit RDEPEND=$DEPEND assignment (prior to EAPI 4)", "RDEPEND.suspect":"RDEPEND contains a package that usually only belongs in DEPEND.", @@ -398,6 +399,7 @@ qawarnings = set(( "DESCRIPTION.toolong", "EAPI.deprecated", "HOMEPAGE.virtual", +"LICENSE.deprecated", "LICENSE.virtual", "KEYWORDS.dropped", "KEYWORDS.stupid", @@ -922,6 +924,13 @@ for x in repoman_settings.archlist(): print(red("up with the "+x+" team.")) print() +global_noiselimit = portage.util.noiselimit +# Suppress error message if @DEPRECATED license group doesn't exist +portage.util.noiselimit = -2 +liclist_deprecated = \ + set(repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"])) +portage.util.noiselimit = global_noiselimit + if not liclist: logging.fatal("Couldn't find licenses?") sys.exit(1) @@ -2014,6 +2023,9 @@ for x in effective_scanlist: if lic not in liclist and lic != "||": stats["LICENSE.invalid"]=stats["LICENSE.invalid"]+1 fails["LICENSE.invalid"].append(x+"/"+y+".ebuild: %s" % lic) + elif lic in liclist_deprecated: + stats["LICENSE.deprecated"] = stats["LICENSE.deprecated"] + 1 + fails["LICENSE.deprecated"].append("%s: %s" % (relative_path, lic)) #keyword checks myuse = myaux["KEYWORDS"].split() diff --git a/man/repoman.1 b/man/repoman.1 index 6dd75e8..e715f05 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -1,4 +1,4 @@ -.TH "REPOMAN" "1" "June 2012" "Portage VERSION" "Portage" +.TH "REPOMAN" "1" "Oct 2012" "Portage VERSION" "Portage" .SH NAME repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree .SH SYNOPSIS @@ -167,6 +167,9 @@ Ebuilds that have been added directly with stable KEYWORDS .B KEYWORDS.stupid Ebuilds that use KEYWORDS=-* instead of package.mask .TP +.B LICENSE.deprecated +This ebuild is listing a deprecated license. +.TP .B LICENSE.invalid This ebuild is listing a license that doesnt exist in portages license/ dir. .TP