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 05b86ad762f6595a755399500ce5e71b27e1cfef..a09ace98a11088a64e24c72815a60d73de4d0297 100755 (executable)
--- 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()