1 |
Author: zmedico |
2 |
Date: 2008-05-27 06:12:43 +0000 (Tue, 27 May 2008) |
3 |
New Revision: 10449 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/emerge |
7 |
Log: |
8 |
Use new Package.use and iuse attributes to avoid extra split() calls. |
9 |
(trunk r10448) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.2/bin/emerge |
13 |
=================================================================== |
14 |
--- main/branches/2.1.2/bin/emerge 2008-05-27 06:08:12 UTC (rev 10448) |
15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-27 06:12:43 UTC (rev 10449) |
16 |
@@ -1750,14 +1750,13 @@ |
17 |
if cached_blockers is not None: |
18 |
blocker_atoms = cached_blockers.atoms |
19 |
else: |
20 |
- myuse = inst_pkg.metadata["USE"].split() |
21 |
# Use aux_get() to trigger FakeVartree global |
22 |
# updates on *DEPEND when appropriate. |
23 |
depstr = " ".join(vardb.aux_get(inst_pkg.cpv, dep_keys)) |
24 |
try: |
25 |
portage_dep._dep_check_strict = False |
26 |
success, atoms = portage.dep_check(depstr, |
27 |
- vardb, settings, myuse=myuse, |
28 |
+ vardb, settings, myuse=pkg.use.enabled, |
29 |
trees=dep_check_trees, myroot=inst_pkg.root) |
30 |
finally: |
31 |
portage_dep._dep_check_strict = True |
32 |
@@ -1792,12 +1791,11 @@ |
33 |
blocking_pkgs.update(blocker_parents.parent_nodes(atom)) |
34 |
|
35 |
# Check for blockers in the other direction. |
36 |
- myuse = new_pkg.metadata["USE"].split() |
37 |
depstr = " ".join(new_pkg.metadata[k] for k in dep_keys) |
38 |
try: |
39 |
portage_dep._dep_check_strict = False |
40 |
success, atoms = portage.dep_check(depstr, |
41 |
- vardb, settings, myuse=myuse, |
42 |
+ vardb, settings, myuse=new_pkg.use.enabled, |
43 |
trees=dep_check_trees, myroot=new_pkg.root) |
44 |
finally: |
45 |
portage_dep._dep_check_strict = True |
46 |
@@ -2466,7 +2464,7 @@ |
47 |
myroot = pkg.root |
48 |
mykey = pkg.cpv |
49 |
metadata = pkg.metadata |
50 |
- myuse = metadata["USE"].split() |
51 |
+ myuse = pkg.use.enabled |
52 |
jbigkey = pkg |
53 |
depth = pkg.depth + 1 |
54 |
|
55 |
@@ -3287,8 +3285,7 @@ |
56 |
if built and not installed and \ |
57 |
("--newuse" in self.myopts or \ |
58 |
"--reinstall" in self.myopts): |
59 |
- iuses = set(filter_iuse_defaults( |
60 |
- pkg.metadata["IUSE"].split())) |
61 |
+ iuses = pkg.iuse.all |
62 |
old_use = pkg.use.enabled |
63 |
if myeb: |
64 |
pkgsettings.setcpv(myeb) |
65 |
@@ -3300,8 +3297,7 @@ |
66 |
forced_flags.update(pkgsettings.usemask) |
67 |
cur_iuse = iuses |
68 |
if myeb and not usepkgonly: |
69 |
- cur_iuse = set(filter_iuse_defaults( |
70 |
- myeb.metadata["IUSE"].split())) |
71 |
+ cur_iuse = myeb.iuse.all |
72 |
if self._reinstall_for_flags(forced_flags, |
73 |
old_use, iuses, |
74 |
now_use, cur_iuse): |
75 |
@@ -3320,8 +3316,7 @@ |
76 |
old_iuse = set(filter_iuse_defaults( |
77 |
vardb.aux_get(cpv, ["IUSE"])[0].split())) |
78 |
cur_use = pkgsettings["PORTAGE_USE"].split() |
79 |
- cur_iuse = set(filter_iuse_defaults( |
80 |
- pkg.metadata["IUSE"].split())) |
81 |
+ cur_iuse = pkg.iuse.all |
82 |
reinstall_for_flags = \ |
83 |
self._reinstall_for_flags( |
84 |
forced_flags, old_use, old_iuse, |
85 |
@@ -3555,7 +3550,6 @@ |
86 |
if blocker_data: |
87 |
blocker_atoms = blocker_data.atoms |
88 |
else: |
89 |
- myuse = pkg.metadata["USE"].split() |
90 |
# Use aux_get() to trigger FakeVartree global |
91 |
# updates on *DEPEND when appropriate. |
92 |
depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys)) |
93 |
@@ -3566,7 +3560,7 @@ |
94 |
portage_dep._dep_check_strict = False |
95 |
try: |
96 |
success, atoms = portage.dep_check(depstr, |
97 |
- final_db, pkgsettings, myuse=myuse, |
98 |
+ final_db, pkgsettings, myuse=pkg.use.enabled, |
99 |
trees=self._graph_trees, myroot=myroot) |
100 |
except Exception, e: |
101 |
if isinstance(e, SystemExit): |
102 |
@@ -3868,7 +3862,7 @@ |
103 |
try: |
104 |
portage_rdepend = self._select_atoms_highest_available( |
105 |
running_root, running_portage.metadata["RDEPEND"], |
106 |
- myuse=running_portage.metadata["USE"].split(), |
107 |
+ myuse=running_portage.use.enabled, |
108 |
parent=running_portage, strict=False) |
109 |
except portage_exception.InvalidDependString, e: |
110 |
portage.writemsg("!!! Invalid RDEPEND in " + \ |
111 |
@@ -4675,7 +4669,7 @@ |
112 |
os.path.dirname(ebuild_path))) |
113 |
else: |
114 |
repo_path_real = portdb.getRepositoryPath(repo_name) |
115 |
- pkg_use = metadata["USE"].split() |
116 |
+ pkg_use = list(pkg.use.enabled) |
117 |
try: |
118 |
restrict = flatten(use_reduce(paren_reduce( |
119 |
pkg.metadata["RESTRICT"]), uselist=pkg_use)) |
120 |
@@ -4755,18 +4749,15 @@ |
121 |
|
122 |
if True: |
123 |
# USE flag display |
124 |
- cur_iuse = list(filter_iuse_defaults( |
125 |
- pkg.metadata["IUSE"].split())) |
126 |
- |
127 |
forced_flags = set() |
128 |
- pkgsettings.setcpv(pkg.cpv, mydb=pkg.metadata) # for package.use.{mask,force} |
129 |
+ pkgsettings.setcpv(pkg) # for package.use.{mask,force} |
130 |
forced_flags.update(pkgsettings.useforce) |
131 |
forced_flags.update(pkgsettings.usemask) |
132 |
|
133 |
- cur_iuse = portage.unique_array(cur_iuse) |
134 |
+ cur_iuse = list(pkg.iuse.all) |
135 |
cur_iuse.sort() |
136 |
- cur_use = pkg_use |
137 |
- cur_use = [flag for flag in cur_use if flag in cur_iuse] |
138 |
+ cur_use = [flag for flag in pkg.use.enabled \ |
139 |
+ if flag in cur_iuse] |
140 |
|
141 |
if myoldbest and myinslotlist: |
142 |
previous_cpv = myoldbest[0] |
143 |
|
144 |
-- |
145 |
gentoo-commits@l.g.o mailing list |