From d3adfff1d34ba8796dedd796ce3506ef14fada21 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 9 Feb 2010 03:02:40 +0000 Subject: Skip atom validation in WorldHandler since WorldSelectedSet handles this already, and use Atom.cp instead of dep_getkey(). svn path=/main/trunk/; revision=15327 --- bin/emaint | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/emaint b/bin/emaint index 461294377..89373a13f 100755 --- 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: -- cgit v1.2.3-1-g7c22