Skip atom validation in WorldHandler since WorldSelectedSet handles this
authorZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:09:11 +0000 (20:09 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:09:11 +0000 (20:09 -0000)
already, and use Atom.cp instead of dep_getkey(). (trunk r15327)

svn path=/main/branches/2.1.7/; revision=15560

bin/emaint

index 90301dbff778d8e41b3b746dfbff89de6b462c0e..b071e582e9187aa58c76b778ff671dd0c6ab7ede 100755 (executable)
@@ -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: