| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-31 23:16:16 +0000 (Sat, 31 May 2008) |
| 3 |
New Revision: 10524 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make PackageSet._setAtoms() use existing Atom instances when available. |
| 9 |
(trunk r10523) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-31 23:10:14 UTC (rev 10523) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-31 23:16:16 UTC (rev 10524) |
| 16 |
@@ -791,11 +791,17 @@ |
| 17 |
self._atoms.clear() |
| 18 |
self._nonatoms.clear() |
| 19 |
def add(self, atom): |
| 20 |
- try: |
| 21 |
- atom = portage_dep.Atom(atom) |
| 22 |
- except portage_exception.InvalidAtom: |
| 23 |
- self._nonatoms.add(atom) |
| 24 |
- return |
| 25 |
+ if not isinstance(atom, portage_dep.Atom): |
| 26 |
+ if isinstance(atom, basestring): |
| 27 |
+ atom = atom.strip() |
| 28 |
+ if not atom: |
| 29 |
+ return |
| 30 |
+ try: |
| 31 |
+ atom = portage_dep.Atom(atom) |
| 32 |
+ except portage_exception.InvalidAtom: |
| 33 |
+ self._nonatoms.add(atom) |
| 34 |
+ return |
| 35 |
+ |
| 36 |
cp_list = self._atoms.get(atom.cp) |
| 37 |
if cp_list is None: |
| 38 |
cp_list = [] |
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives