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 9ECEB1381F3 for ; Thu, 29 Nov 2012 21:40:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0D62E067D; Thu, 29 Nov 2012 21:40:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 440B8E067D for ; Thu, 29 Nov 2012 21:40: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 7AD3633D921 for ; Thu, 29 Nov 2012 21:40:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D089CE5436 for ; Thu, 29 Nov 2012 21:40: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: <1354225193.a7ce4f6067cafd636119f05bba6c0ed1e9814802.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a7ce4f6067cafd636119f05bba6c0ed1e9814802 X-VCS-Branch: master Date: Thu, 29 Nov 2012 21:40: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: 9e0437e6-75c2-4e8f-b568-b5d9657bdb83 X-Archives-Hash: 616d7510b04c9428874dae3418b0a9d2 commit: a7ce4f6067cafd636119f05bba6c0ed1e9814802 Author: Zac Medico gentoo org> AuthorDate: Thu Nov 29 21:39:53 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Nov 29 21:39:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a7ce4f60 repoman: handle missing @DEPRECATED lic group --- bin/repoman | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index a38ffe1..161d87c 100755 --- a/bin/repoman +++ b/bin/repoman @@ -925,12 +925,10 @@ 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 +liclist_deprecated = set() +if "DEPRECATED" in repoman_settings._license_manager._license_groups: + liclist_deprecated.update( + repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"])) if not liclist: logging.fatal("Couldn't find licenses?")