Don't print emaint warning for masked/non-existant packages. When using

--verbose, print a warning for those packages.

svn path=/main/trunk/; revision=2493

diff --git a/bin/emerge b/bin/emerge
index 99fb2e894855f07e968c2c181aa833291198a468..566556c9033497f0fdbefc29934bf05b93acdc1b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1432,6 +1432,7 @@ class depgraph:
                                newlist.append(atom)
                mylist = newlist
                
+               missing_atoms = []
                for mydep in mylist:
                        try:
                                if not self.select_dep(portage.root, mydep, raise_on_missing=True):
@@ -1440,12 +1441,17 @@ class depgraph:
                        except ValueError:
                                if "--debug" in myopts:
                                        raise
-                               world_problems = True
+                               missing_atoms.append(mydep)
 
                if world_problems:
                        print "\n!!! Problems have been detected with your world file"
                        print "!!! Please run "+green("emaint --check world")+"\n"
 
+               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"
+
                return 1
 
        def match(self,mydep,myroot=portage.root,mykey=None):