Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12495 - main/trunk/pym/portage
Date: Tue, 13 Jan 2009 21:02:35
Message-Id: E1LMqP9-0008MT-Tl@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-01-13 21:02:30 +0000 (Tue, 13 Jan 2009)
3 New Revision: 12495
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 Bug #254860 - Inside _expand_new_virtuals(), generate instances of Atom
9 instead of plain strings, so calling code can assume that only Atom instances
10 will be returned when strict mode is enabled.
11
12
13 Modified: main/trunk/pym/portage/__init__.py
14 ===================================================================
15 --- main/trunk/pym/portage/__init__.py 2009-01-13 04:43:40 UTC (rev 12494)
16 +++ main/trunk/pym/portage/__init__.py 2009-01-13 21:02:30 UTC (rev 12495)
17 @@ -6364,13 +6364,14 @@
18 if len(virtual_atoms) == 1:
19 # It wouldn't make sense to block all the components of a
20 # compound virtual, so only a single atom block is allowed.
21 - a.append("!" + virtual_atoms[0])
22 + a.append(portage.dep.Atom("!" + virtual_atoms[0]))
23 else:
24 - mycheck[1].append("="+y[0]) # pull in the new-style virtual
25 + # pull in the new-style virtual
26 + mycheck[1].append(portage.dep.Atom("="+y[0]))
27 a.append(mycheck[1])
28 # Plain old-style virtuals. New-style virtuals are preferred.
29 for y in mychoices:
30 - a.append(x.replace(mykey, y))
31 + a.append(portage.dep.Atom(x.replace(mykey, y, 1)))
32 if isblocker and not a:
33 # Probably a compound virtual. Pass the atom through unprocessed.
34 newsplit.append(x)