From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 Nov 2012 21:39:53 +0000 (-0800)
Subject: repoman: handle missing @DEPRECATED lic group
X-Git-Tag: v2.2.0_alpha143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7ce4f6067cafd636119f05bba6c0ed1e9814802;p=portage.git

repoman: handle missing @DEPRECATED lic group
---

diff --git a/bin/repoman b/bin/repoman
index a38ffe121..161d87c01 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?")