| 1 |
commit: a7ce4f6067cafd636119f05bba6c0ed1e9814802 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 29 21:39:53 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 29 21:39:53 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a7ce4f60 |
| 7 |
|
| 8 |
repoman: handle missing @DEPRECATED lic group |
| 9 |
|
| 10 |
--- |
| 11 |
bin/repoman | 10 ++++------ |
| 12 |
1 files changed, 4 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/repoman b/bin/repoman |
| 15 |
index a38ffe1..161d87c 100755 |
| 16 |
--- a/bin/repoman |
| 17 |
+++ b/bin/repoman |
| 18 |
@@ -925,12 +925,10 @@ for x in repoman_settings.archlist(): |
| 19 |
print(red("up with the "+x+" team.")) |
| 20 |
print() |
| 21 |
|
| 22 |
-global_noiselimit = portage.util.noiselimit |
| 23 |
-# Suppress error message if @DEPRECATED license group doesn't exist |
| 24 |
-portage.util.noiselimit = -2 |
| 25 |
-liclist_deprecated = \ |
| 26 |
- set(repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"])) |
| 27 |
-portage.util.noiselimit = global_noiselimit |
| 28 |
+liclist_deprecated = set() |
| 29 |
+if "DEPRECATED" in repoman_settings._license_manager._license_groups: |
| 30 |
+ liclist_deprecated.update( |
| 31 |
+ repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"])) |
| 32 |
|
| 33 |
if not liclist: |
| 34 |
logging.fatal("Couldn't find licenses?") |
Archives