Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10525 - main/trunk/pym/portage/sets
Date: Sun, 01 Jun 2008 01:27:28
Message-Id: E1K2cLy-0005mx-F4@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-06-01 01:27:21 +0000 (Sun, 01 Jun 2008)
3 New Revision: 10525
4
5 Modified:
6 main/trunk/pym/portage/sets/base.py
7 Log:
8 Fix EditablePackageSet.update() to create Atom instances when necessary.
9
10
11 Modified: main/trunk/pym/portage/sets/base.py
12 ===================================================================
13 --- main/trunk/pym/portage/sets/base.py 2008-05-31 23:16:16 UTC (rev 10524)
14 +++ main/trunk/pym/portage/sets/base.py 2008-06-01 01:27:21 UTC (rev 10525)
15 @@ -158,11 +158,15 @@
16 modified = False
17 normal_atoms = []
18 for a in atoms:
19 - if isvalidatom(a):
20 - normal_atoms.append(a)
21 - else:
22 - modified = True
23 - self._nonatoms.add(a)
24 + if not isinstance(a, Atom):
25 + try:
26 + a = Atom(a)
27 + except InvalidAtom:
28 + modified = True
29 + self._nonatoms.add(a)
30 + continue
31 + normal_atoms.append(a)
32 +
33 if normal_atoms:
34 modified = True
35 self._atoms.update(normal_atoms)
36
37 --
38 gentoo-commits@l.g.o mailing list