From: Jason Stubbs <jstubbs@gentoo.org>
Date: Fri, 30 Dec 2005 09:04:00 +0000 (-0000)
Subject: Don't recommend emaint for packages that are missing or masked. Instead,
X-Git-Tag: v2.0.54~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=06c7084229f06e005b2b4a006fce28e6c370b9b9;p=portage.git

Don't recommend emaint for packages that are missing or masked. Instead,
print a warning regarding them when using --verbose.

svn path=/main/branches/2.0.54/; revision=2501
---

diff --git a/bin/emerge b/bin/emerge
index 05b86ad76..a09ace98a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1400,19 +1400,25 @@ class depgraph:
 			worlddict=genericdict(worldlist)
 
 			world_problems = False
+			missing_atoms = []
 			for x in worlddict.keys():
 				if not portage.isvalidatom(x):
 					world_problems = True
 				elif not portage.db["/"]["vartree"].dbapi.match(x):
 					world_problems = True
 				elif not portage.db["/"]["porttree"].dbapi.match(x):
-					world_problems = True
+					missing_atoms.append(x)
 				else:
 					sysdict[x]=worlddict[x]
 			if world_problems:
 				print "\n!!! Problems have been detected with your world file"
 				print "!!! Please run "+green("emaint --check world")+"\n"
 			del world_problems
+			if missing_atoms and "--verbose" in myopts:
+				print "\n!!! Packages for the following atoms are either all"
+				print "!!! masked or don't exist:"
+				print " ".join(missing_atoms) + "\n"
+			del missing_atoms
 
 			mylist = sysdict.keys()