From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:09:11 +0000 (-0000)
Subject: Skip atom validation in WorldHandler since WorldSelectedSet handles this
X-Git-Tag: v2.1.8~162
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d360d6706d082f78b14bbbc75c477af174a96f89;p=portage.git

Skip atom validation in WorldHandler since WorldSelectedSet handles this
already, and use Atom.cp instead of dep_getkey(). (trunk r15327)

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

diff --git a/bin/emaint b/bin/emaint
index 90301dbff..b071e582e 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: