[gentoo-commits] portage r11995 - main/trunk/pym/_emerge

[gentoo-commits] portage r11995 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-18 21:22:48 +0000 (Tue, 18 Nov 2008)
New Revision: 11995

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Move the repo_name check/warning into a function.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-11-18 21:13:03 UTC (rev 11994)
+++ main/trunk/pym/_emerge/__init__.py	2008-11-18 21:22:48 UTC (rev 11995)
@@ -13844,6 +13844,32 @@
 			newargs.append(a)
 	return (newargs, retval)
 
+def repo_name_check(trees):
+	missing_repo_names = set()
+	for root, root_trees in trees.iteritems():
+		if "porttree" in root_trees:
+			portdb = root_trees["porttree"].dbapi
+			missing_repo_names.update(portdb.porttrees)
+			repos = portdb.getRepositories()
+			for r in repos:
+				missing_repo_names.discard(portdb.getRepositoryPath(r))
+
+	if missing_repo_names:
+		msg = []
+		msg.append("WARNING: One or more repositories " + \
+			"have missing repo_name entries:")
+		msg.append("")
+		for p in missing_repo_names:
+			msg.append("\t%s/profiles/repo_name" % (p,))
+		msg.append("")
+		msg.extend(textwrap.wrap("NOTE: Each repo_name entry " + \
+			"should be a plain text file containing a unique " + \
+			"name for the repository on the first line.", 70))
+		writemsg_level("".join("%s\n" % l for l in msg),
+			level=logging.WARNING, noiselevel=-1)
+
+	return bool(missing_repo_names)
+
 def emerge_main():
 	global portage	# NFC why this is necessary now - genone
 	portage._disable_legacy_globals()
@@ -13904,30 +13930,8 @@
 
 	if "--quiet" not in myopts:
 		portage.deprecated_profile_check()
-		missing_repo_names = set()
-		for root in trees:
-			if "porttree" in trees[root]:
-				db = trees[root]["porttree"].dbapi
-				paths = (db.mysettings["PORTDIR"]+" "+db.mysettings["PORTDIR_OVERLAY"]).split()
-				missing_repo_names.update(os.path.realpath(p) for p in paths)
-				repos = db.getRepositories()
-				for r in repos:
-					missing_repo_names.discard(db.getRepositoryPath(r))
+		repo_name_check(trees)
 
-		if missing_repo_names:
-			msg = []
-			msg.append("WARNING: One or more repositories " + \
-				"have missing repo_name entries:")
-			msg.append("")
-			for p in missing_repo_names:
-				msg.append("\t%s/profiles/repo_name" % (p,))
-			msg.append("")
-			msg.extend(textwrap.wrap("NOTE: Each repo_name entry " + \
-				"should be a plain text file containing a unique " + \
-				"name for the repository on the first line.", 70))
-			writemsg_level("".join("%s\n" % l for l in msg),
-				level=logging.WARNING, noiselevel=-1)
-
 	eclasses_overridden = {}
 	for mytrees in trees.itervalues():
 		mydb = mytrees["porttree"].dbapi