| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-09 03:02:40 +0000 (Tue, 09 Feb 2010) |
| 3 |
New Revision: 15327 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/emaint |
| 7 |
Log: |
| 8 |
Skip atom validation in WorldHandler since WorldSelectedSet handles this |
| 9 |
already, and use Atom.cp instead of dep_getkey(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/emaint |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/emaint 2010-02-07 19:55:02 UTC (rev 15326) |
| 15 |
+++ main/trunk/bin/emaint 2010-02-09 03:02:40 UTC (rev 15327) |
| 16 |
@@ -51,7 +51,7 @@ |
| 17 |
if onProgress: |
| 18 |
onProgress(maxval, 0) |
| 19 |
for i, atom in enumerate(world_atoms): |
| 20 |
- if not portage.isvalidatom(atom): |
| 21 |
+ if not isinstance(atom, portage.dep.Atom): |
| 22 |
if atom.startswith(SETPREFIX): |
| 23 |
s = atom[len(SETPREFIX):] |
| 24 |
if s in sets: |
| 25 |
@@ -63,12 +63,11 @@ |
| 26 |
if onProgress: |
| 27 |
onProgress(maxval, i+1) |
| 28 |
continue |
| 29 |
- cp = portage.dep_getkey(atom) |
| 30 |
okay = True |
| 31 |
if not vardb.match(atom): |
| 32 |
self.not_installed.append(atom) |
| 33 |
okay = False |
| 34 |
- if portage.catsplit(cp)[0] not in categories: |
| 35 |
+ if portage.catsplit(atom.cp)[0] not in categories: |
| 36 |
self.invalid_category.append(atom) |
| 37 |
okay = False |
| 38 |
if okay: |
Archives