Skip atom validation in WorldHandler since WorldSelectedSet handles this

already, and use Atom.cp instead of dep_getkey().

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

diff --git a/bin/emaint b/bin/emaint
index 46129437779ae1569802c46bc357897c334ef189..89373a13fe8e3d53a1183d0dcda2db8abe77b6a4 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -51,7 +51,7 @@ class WorldHandler(object):
                if onProgress:
                        onProgress(maxval, 0)
                for i, atom in enumerate(world_atoms):
-                       if not portage.isvalidatom(atom):
+                       if not isinstance(atom, portage.dep.Atom):
                                if atom.startswith(SETPREFIX):
                                        s = atom[len(SETPREFIX):]
                                        if s in sets:
@@ -63,12 +63,11 @@ class WorldHandler(object):
                                if onProgress:
                                        onProgress(maxval, i+1)
                                continue
-                       cp = portage.dep_getkey(atom)
                        okay = True
                        if not vardb.match(atom):
                                self.not_installed.append(atom)
                                okay = False
-                       if portage.catsplit(cp)[0] not in categories:
+                       if portage.catsplit(atom.cp)[0] not in categories:
                                self.invalid_category.append(atom)
                                okay = False
                        if okay: