Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10103 - main/branches/2.1.2/bin
Date: Fri, 02 May 2008 20:17:08
Message-Id: E1Js1gn-00085Q-HE@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-02 20:17:04 +0000 (Fri, 02 May 2008)
3 New Revision: 10103
4
5 Modified:
6 main/branches/2.1.2/bin/emerge
7 Log:
8 Use Package.cp attribute instead of calling cpv_getkey(). (trunk r10102)
9
10
11 Modified: main/branches/2.1.2/bin/emerge
12 ===================================================================
13 --- main/branches/2.1.2/bin/emerge 2008-05-02 20:16:06 UTC (rev 10102)
14 +++ main/branches/2.1.2/bin/emerge 2008-05-02 20:17:04 UTC (rev 10103)
15 @@ -3586,13 +3586,16 @@
16 return [node for node in mygraph.leaf_nodes(**kwargs) \
17 if isinstance(node, Package) and \
18 node.operation != "uninstall"]
19 - if True:
20 - for node in mygraph.order:
21 - if node.root == "/" and \
22 - "sys-apps/portage" == portage.cpv_getkey(node.cpv):
23 - portage_node = node
24 - asap_nodes.append(node)
25 - break
26 +
27 + # sys-apps/portage needs special treatment if ROOT="/"
28 + for node in mygraph.order:
29 + if isinstance(node, Package) and \
30 + "sys-apps/portage" == node.cp and \
31 + "/" == node.root:
32 + portage_node = node
33 + asap_nodes.append(node)
34 + break
35 +
36 ignore_priority_soft_range = [None]
37 ignore_priority_soft_range.extend(
38 xrange(DepPriority.MIN, DepPriority.MEDIUM_SOFT + 1))
39
40 --
41 gentoo-commits@l.g.o mailing list