1 |
Author: zmedico |
2 |
Date: 2008-02-27 04:06:50 +0000 (Wed, 27 Feb 2008) |
3 |
New Revision: 9387 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
main/trunk/pym/portage/__init__.py |
8 |
Log: |
9 |
Bug #211554 - Replace references to config["USE"] with references to |
10 |
config["PORTAGE_USE"] (which is filtered for intersection with IUSE) |
11 |
so that dependency calculations at installation time are consistent |
12 |
with those at depclean time. |
13 |
|
14 |
|
15 |
Modified: main/trunk/pym/_emerge/__init__.py |
16 |
=================================================================== |
17 |
--- main/trunk/pym/_emerge/__init__.py 2008-02-26 08:25:02 UTC (rev 9386) |
18 |
+++ main/trunk/pym/_emerge/__init__.py 2008-02-27 04:06:50 UTC (rev 9387) |
19 |
@@ -1103,7 +1103,7 @@ |
20 |
metadata = None |
21 |
if metadata and not built: |
22 |
pkgsettings.setcpv(cpv, mydb=metadata) |
23 |
- metadata["USE"] = pkgsettings.get("USE", "") |
24 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
25 |
if metadata is None: |
26 |
mreasons = ["corruption"] |
27 |
else: |
28 |
@@ -2119,7 +2119,7 @@ |
29 |
metadata = dict(izip(self._mydbapi_keys, |
30 |
portdb.aux_get(mykey, self._mydbapi_keys))) |
31 |
pkgsettings.setcpv(mykey, mydb=metadata) |
32 |
- metadata["USE"] = pkgsettings["USE"] |
33 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
34 |
pkg = Package(type_name="ebuild", root=myroot, |
35 |
cpv=mykey, metadata=metadata, onlydeps=onlydeps) |
36 |
args.append(PackageArg(arg=x, package=pkg, |
37 |
@@ -2427,7 +2427,7 @@ |
38 |
if not built: |
39 |
if (is_virt or "?" in metadata["LICENSE"]): |
40 |
pkgsettings.setcpv(cpv, mydb=metadata) |
41 |
- metadata["USE"] = pkgsettings["USE"] |
42 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
43 |
else: |
44 |
metadata["USE"] = "" |
45 |
|
46 |
@@ -2615,7 +2615,7 @@ |
47 |
if not built: |
48 |
if "?" in metadata["LICENSE"]: |
49 |
pkgsettings.setcpv(cpv, mydb=metadata) |
50 |
- metadata["USE"] = pkgsettings.get("USE","") |
51 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
52 |
else: |
53 |
metadata["USE"] = "" |
54 |
myarg = None |
55 |
@@ -2672,7 +2672,7 @@ |
56 |
pkgsettings.setcpv(myeb, mydb=mydb) |
57 |
else: |
58 |
pkgsettings.setcpv(cpv, mydb=mydb) |
59 |
- now_use = pkgsettings["USE"].split() |
60 |
+ now_use = pkgsettings["PORTAGE_USE"].split() |
61 |
forced_flags = set() |
62 |
forced_flags.update(pkgsettings.useforce) |
63 |
forced_flags.update(pkgsettings.usemask) |
64 |
@@ -2698,7 +2698,7 @@ |
65 |
old_use = vardb.aux_get(cpv, ["USE"])[0].split() |
66 |
old_iuse = set(filter_iuse_defaults( |
67 |
vardb.aux_get(cpv, ["IUSE"])[0].split())) |
68 |
- cur_use = pkgsettings["USE"].split() |
69 |
+ cur_use = pkgsettings["PORTAGE_USE"].split() |
70 |
cur_iuse = set(filter_iuse_defaults( |
71 |
metadata["IUSE"].split())) |
72 |
reinstall_for_flags = \ |
73 |
@@ -2729,7 +2729,7 @@ |
74 |
db.aux_get(cpv, self._mydbapi_keys))) |
75 |
if not built: |
76 |
pkgsettings.setcpv(cpv, mydb=metadata) |
77 |
- metadata["USE"] = pkgsettings.get("USE","") |
78 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
79 |
myeb = cpv |
80 |
matched_packages.append( |
81 |
Package(type_name=pkg_type, root=root, |
82 |
@@ -3652,7 +3652,7 @@ |
83 |
repo_path_real = os.path.dirname(os.path.dirname( |
84 |
os.path.dirname(ebuild_path))) |
85 |
pkgsettings.setcpv(pkg_key, mydb=mydbapi) |
86 |
- metadata["USE"] = pkgsettings["USE"] |
87 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
88 |
else: |
89 |
repo_path_real = portdb.getRepositoryPath(repo_name) |
90 |
pkg_use = metadata["USE"].split() |
91 |
@@ -4242,7 +4242,7 @@ |
92 |
if pkg_type == "ebuild": |
93 |
pkgsettings = self.pkgsettings[myroot] |
94 |
pkgsettings.setcpv(pkg_key, mydb=fakedb[myroot]) |
95 |
- fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["USE"]}) |
96 |
+ fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["PORTAGE_USE"]}) |
97 |
self.spinner.update() |
98 |
|
99 |
class RepoDisplay(object): |
100 |
@@ -4532,7 +4532,7 @@ |
101 |
metadata.update(izip(metadata_keys, |
102 |
mydbapi.aux_get(pkg_key, metadata_keys))) |
103 |
pkgsettings.setcpv(pkg_key, mydb=mydbapi) |
104 |
- metadata["USE"] = pkgsettings["USE"] |
105 |
+ metadata["USE"] = pkgsettings["PORTAGE_USE"] |
106 |
else: |
107 |
if pkg_type == "binary": |
108 |
mydbapi = bindb |
109 |
@@ -6203,7 +6203,7 @@ |
110 |
if x != "USE": |
111 |
print '%s="%s"' % (x, settings[x]) |
112 |
else: |
113 |
- use = set(settings["USE"].split()) |
114 |
+ use = set(settings["PORTAGE_USE"].split()) |
115 |
use_expand = settings["USE_EXPAND"].split() |
116 |
use_expand.sort() |
117 |
for varname in use_expand: |
118 |
@@ -6282,7 +6282,7 @@ |
119 |
if portdb.cpv_exists(pkg): |
120 |
mydb = portdb |
121 |
pkgsettings.setcpv(pkg, mydb=mydb) |
122 |
- if valuesmap["IUSE"].intersection(pkgsettings["USE"].split()) != \ |
123 |
+ if valuesmap["IUSE"].intersection(pkgsettings["PORTAGE_USE"].split()) != \ |
124 |
valuesmap["USE"]: |
125 |
diff_values["USE"] = valuesmap["USE"] |
126 |
# If a difference was found, print the info for |
127 |
|
128 |
Modified: main/trunk/pym/portage/__init__.py |
129 |
=================================================================== |
130 |
--- main/trunk/pym/portage/__init__.py 2008-02-26 08:25:02 UTC (rev 9386) |
131 |
+++ main/trunk/pym/portage/__init__.py 2008-02-27 04:06:50 UTC (rev 9387) |
132 |
@@ -2135,7 +2135,7 @@ |
133 |
return |
134 |
if isinstance(mydbapi, portdbapi): |
135 |
self.setcpv(mycpv, mydb=mydbapi) |
136 |
- myuse = self["USE"] |
137 |
+ myuse = self["PORTAGE_USE"] |
138 |
elif isinstance(mydbapi, dict): |
139 |
myuse = mydbapi["USE"] |
140 |
else: |
141 |
@@ -2700,7 +2700,7 @@ |
142 |
def selinux_enabled(self): |
143 |
if getattr(self, "_selinux_enabled", None) is None: |
144 |
self._selinux_enabled = 0 |
145 |
- if "selinux" in self["USE"].split(): |
146 |
+ if "selinux" in self["PORTAGE_USE"].split(): |
147 |
if "selinux" in globals(): |
148 |
if selinux.is_selinux_enabled() == 1: |
149 |
self._selinux_enabled = 1 |
150 |
@@ -5393,7 +5393,7 @@ |
151 |
if use=="yes": |
152 |
if myuse is None: |
153 |
#default behavior |
154 |
- myusesplit = mysettings["USE"].split() |
155 |
+ myusesplit = mysettings["PORTAGE_USE"].split() |
156 |
else: |
157 |
myusesplit = myuse |
158 |
# We've been given useflags to use. |
159 |
@@ -5718,7 +5718,7 @@ |
160 |
return ["corruption"] |
161 |
if "?" in metadata["LICENSE"]: |
162 |
settings.setcpv(p, mydb=metadata) |
163 |
- metadata["USE"] = settings.get("USE", "") |
164 |
+ metadata["USE"] = settings["PORTAGE_USE"] |
165 |
else: |
166 |
metadata["USE"] = "" |
167 |
mycp=mysplit[0]+"/"+mysplit[1] |
168 |
|
169 |
-- |
170 |
gentoo-commits@l.g.o mailing list |