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

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

commit:     abe9ad3cd4419a1e87356591f0a778005f27d4ac
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:32:18 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Nov 17 00:53:13 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=abe9ad3c

repoman/main.py: Move the check class instantiations out of the xpkg loop

This should help reduce overall run time when doing large repoman full runs.
It instead re-uses the class instances for each pkg checked.

---
 pym/repoman/main.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8197400..8a1a043 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -270,6 +270,19 @@ if options.if_modified == "y":
 		chain(changed.changed, changed.new, changed.removed),
 		repolevel, reposplit, categories))
 
+#######  initialize our checks classes here before the big xpkg loop
+manifester = Manifests(options, qatracker, repoman_settings)
+is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
+filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
+	vcs_settings)
+status_check = VCSStatus(vcs_settings, qatracker)
+fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings, portdb,
+	vcs_settings)
+pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
+thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
+use_flag_checks = USEFlagChecks(qatracker, uselist)
+
+
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
 	logging.info("checking package %s" % xpkg)
@@ -286,7 +299,6 @@ for xpkg in effective_scanlist:
 	checkdir_relative = os.path.join(".", checkdir_relative)
 
 #####################
-	manifester = Manifests(options, qatracker, repoman_settings)
 	if manifester.run(checkdir, portdb):
 		continue
 	if not manifester.generated_manifest:
@@ -299,7 +311,6 @@ for xpkg in effective_scanlist:
 	checkdirlist = os.listdir(checkdir)
 
 ######################
-	is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
 	pkgs, allvalid = is_ebuild.check(checkdirlist, checkdir, xpkg)
 	if is_ebuild.continue_:
 		# If we can't access all the metadata then it's totally unsafe to
@@ -317,26 +328,20 @@ for xpkg in effective_scanlist:
 	ebuildlist = sorted(pkgs.values())
 	ebuildlist = [pkg.pf for pkg in ebuildlist]
 #######################
-	filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
-		vcs_settings)
 	filescheck.check(checkdir, checkdirlist, checkdir_relative,
 		changed.changed, changed.new)
 #######################
-	status_check = VCSStatus(vcs_settings, qatracker)
 	status_check.check(check_ebuild_notadded, checkdir, checkdir_relative, xpkg)
 	eadded.extend(status_check.eadded)
 
 #################
-	fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings, portdb,
-		vcs_settings)
 	fetchcheck.check(xpkg, checkdir, checkdir_relative, changed.changed, changed.new)
 #################
 
 	if check_changelog and "ChangeLog" not in checkdirlist:
 		qatracker.add_error("changelog.missing", xpkg + "/ChangeLog")
 #################
-	pkgmeta = PkgMetadata(options, qatracker, repolevel, repoman_settings)
-	pkgmeta.check(xpkg, checkdir, checkdirlist)
+	pkgmeta.check(xpkg, checkdir, checkdirlist, repolevel)
 	muselist = frozenset(pkgmeta.musedict)
 #################
 
@@ -394,7 +399,6 @@ for xpkg in effective_scanlist:
 
 		if not fetchcheck.src_uri_error:
 			#######################
-			thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
 			thirdparty.check(myaux, ebuild.relative_path)
 			#######################
 		if myaux.get("PROVIDE"):
@@ -625,7 +629,6 @@ for xpkg in effective_scanlist:
 		badprovsyntax = badprovsyntax > 0
 
 		#################
-		use_flag_checks = USEFlagChecks(qatracker, uselist)
 		use_flag_checks.check(pkg, xpkg, ebuild, y_ebuild, muselist)
 
 		ebuild_used_useflags = use_flag_checks.getUsedUseFlags()