diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-02-09 03:02:40 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-02-09 03:02:40 +0000 |
commit | d3adfff1d34ba8796dedd796ce3506ef14fada21 (patch) | |
tree | a395d4298bded7e773d89f9c756e6f57ecfdc9d8 | |
parent | d4c3e1144e8cfc4b4e80a8573f1dcb5e5c6ed39e (diff) | |
download | portage-d3adfff1d34ba8796dedd796ce3506ef14fada21.tar.gz portage-d3adfff1d34ba8796dedd796ce3506ef14fada21.tar.bz2 portage-d3adfff1d34ba8796dedd796ce3506ef14fada21.zip |
Skip atom validation in WorldHandler since WorldSelectedSet handles this
already, and use Atom.cp instead of dep_getkey().
svn path=/main/trunk/; revision=15327
-rwxr-xr-x | bin/emaint | 5 |
1 files changed, 2 insertions, 3 deletions
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: |