Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13751 - main/trunk/pym/portage
Date: Tue, 30 Jun 2009 23:26:40
Message-Id: E1MLmij-0000of-Eq@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-06-30 23:26:36 +0000 (Tue, 30 Jun 2009)
3 New Revision: 13751
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 Remove obsolete blocker expansion code from _expand_new_virtuals.
9
10
11 Modified: main/trunk/pym/portage/__init__.py
12 ===================================================================
13 --- main/trunk/pym/portage/__init__.py 2009-06-30 23:22:52 UTC (rev 13750)
14 +++ main/trunk/pym/portage/__init__.py 2009-06-30 23:26:36 UTC (rev 13751)
15 @@ -6945,9 +6945,6 @@
16 newsplit.append(x)
17 continue
18 match_atom = x
19 - if isblocker:
20 - match_atom = x.lstrip("!")
21 - isblocker = x[:-len(match_atom)]
22 pkgs = []
23 matches = portdb.match(match_atom)
24 # Use descending order to prefer higher versions.
25 @@ -6998,17 +6995,10 @@
26 if not mycheck[0]:
27 raise portage.exception.ParseError(
28 "%s: %s '%s'" % (y[0], mycheck[1], depstring))
29 - if isblocker:
30 - virtual_atoms = [atom for atom in mycheck[1] \
31 - if not atom.startswith("!")]
32 - if len(virtual_atoms) == 1:
33 - # It wouldn't make sense to block all the components of a
34 - # compound virtual, so only a single atom block is allowed.
35 - a.append(portage.dep.Atom(isblocker + virtual_atoms[0]))
36 - else:
37 - # pull in the new-style virtual
38 - mycheck[1].append(portage.dep.Atom("="+y[0]))
39 - a.append(mycheck[1])
40 +
41 + # pull in the new-style virtual
42 + mycheck[1].append(portage.dep.Atom("="+y[0]))
43 + a.append(mycheck[1])
44 # Plain old-style virtuals. New-style virtuals are preferred.
45 if not pkgs:
46 if repoman:
47 @@ -7026,7 +7016,7 @@
48 portdb.aux_get(matches[-1], ['PROVIDE'])[0].split():
49 a.append(new_atom)
50
51 - if not a and not isblocker and mychoices:
52 + if not a and mychoices:
53 # Check for a virtual package.provided match.
54 for y in mychoices:
55 new_atom = portage.dep.Atom(x.replace(mykey, dep_getkey(y), 1))
56 @@ -7039,10 +7029,7 @@
57 elif len(a) == 1:
58 newsplit.append(a[0])
59 else:
60 - if isblocker:
61 - newsplit.extend(a)
62 - else:
63 - newsplit.append(['||'] + a)
64 + newsplit.append(['||'] + a)
65
66 return newsplit