[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     10d674e542d54980eea6bcede2819af3504fc85a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 04:09:27 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue May 27 05:04:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=10d674e5

repoman/main.pt: Move some additional code to repos.py

---
 pym/repoman/main.py  | 23 ++---------------------
 pym/repoman/repos.py | 24 ++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 2697b1b..836ca1e 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -232,8 +232,8 @@ else:
 ###################
 
 # get lists of valid keywords, licenses, and use
-new_data = repo_metadata(repo_settings.portdb)
-kwlist, liclist, uselist, profile_list, global_pmaskdict = new_data
+new_data = repo_metadata(repo_settings.portdb, repoman_settings)
+kwlist, liclist, uselist, profile_list, global_pmaskdict, liclist_deprecated = new_data
 
 repoman_settings['PORTAGE_ARCHLIST'] = ' '.join(sorted(kwlist))
 repoman_settings.backup_changes('PORTAGE_ARCHLIST')
@@ -248,25 +248,6 @@ check_profiles(profiles, repoman_settings.archlist())
 
 ####################
 
-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?")
-	sys.exit(1)
-
-if not kwlist:
-	logging.fatal("Couldn't read KEYWORDS from arch.list")
-	sys.exit(1)
-
-if not uselist:
-	logging.fatal("Couldn't find use.desc?")
-	sys.exit(1)
-
-####################
-
 scanlist = scan(repolevel, reposplit, startdir, categories, repo_settings)
 
 ####################

diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index d5eaf60..16de8bf 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -148,8 +148,27 @@ class RepoSettings(object):
 					logging.error(line)
 				sys.exit(1)
 
+def list_checks(kwlist, liclist, uselist, repoman_settings):
+	liclist_deprecated = set()
+	if "DEPRECATED" in repoman_settings._license_manager._license_groups:
+		liclist_deprecated.update(
+			repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"]))
 
-def repo_metadata(portdb):
+	if not liclist:
+		logging.fatal("Couldn't find licenses?")
+		sys.exit(1)
+
+	if not kwlist:
+		logging.fatal("Couldn't read KEYWORDS from arch.list")
+		sys.exit(1)
+
+	if not uselist:
+		logging.fatal("Couldn't find use.desc?")
+		sys.exit(1)
+	return liclist_deprecated
+
+
+def repo_metadata(portdb, repoman_settings):
 	# get lists of valid keywords, licenses, and use
 	kwlist = set()
 	liclist = set()
@@ -236,7 +255,8 @@ def repo_metadata(portdb):
 		global_pmaskdict.setdefault(x.cp, []).append(x)
 	del global_pmasklines
 
-	return (kwlist, liclist, uselist, profile_list, global_pmaskdict)
+	return (kwlist, liclist, uselist, profile_list, global_pmaskdict,
+		list_checks(kwlist, liclist, uselist, repoman_settings))
 
 
 def has_global_mask(pkg, global_pmaskdict):