1 |
This reverts commit 739845a6eab95fbc44eab1b7b938c860563631d7. |
2 |
--- |
3 |
cnf/sets/portage.conf | 1 - |
4 |
doc/config/sets.docbook | 4 +--- |
5 |
man/color.map.5 | 11 ---------- |
6 |
man/portage.5 | 1 - |
7 |
pym/_emerge/resolver/output.py | 25 +++++++--------------- |
8 |
pym/_emerge/resolver/output_helpers.py | 17 +++------------ |
9 |
pym/portage/_sets/__init__.py | 8 ------- |
10 |
pym/portage/_sets/base.py | 1 - |
11 |
pym/portage/output.py | 39 ++++++++++++++++------------------ |
12 |
9 files changed, 30 insertions(+), 77 deletions(-) |
13 |
|
14 |
diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf |
15 |
index e990620..ac282d9 100644 |
16 |
--- a/cnf/sets/portage.conf |
17 |
+++ b/cnf/sets/portage.conf |
18 |
@@ -49,7 +49,6 @@ class = portage.sets.files.StaticFileSet |
19 |
multiset = true |
20 |
directory = %(PORTAGE_CONFIGROOT)setc/portage/sets |
21 |
world-candidate = True |
22 |
-user-set = True |
23 |
|
24 |
# Set to rebuild all packages that need a preserved lib that only remains due |
25 |
# to FEATURES=preserve-libs |
26 |
diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook |
27 |
index 02135d6..749b775 100644 |
28 |
--- a/doc/config/sets.docbook |
29 |
+++ b/doc/config/sets.docbook |
30 |
@@ -57,8 +57,6 @@ |
31 |
is missing)</para></listitem> |
32 |
<listitem><para><varname>world-candidate</varname>, which determines if |
33 |
given package should be added to the <varname>world</varname> set</para></listitem> |
34 |
- <listitem><para><varname>user-set</varname>, which determines if |
35 |
- given package should be colorized as a user set</para></listitem> |
36 |
</itemizedlist> |
37 |
<para> |
38 |
Some handler classes might require additional options for their configuration, |
39 |
@@ -95,7 +93,7 @@ |
40 |
but to indicate that the section should generate multiple sets it's |
41 |
also necessary to set the <varname>multiset</varname> option to |
42 |
<parameter>true</parameter>. The <varname>world-candidate</varname> |
43 |
- and <varname>user-set</varname> options are also supported like with |
44 |
+ option also supported like with |
45 |
single sets (they'll apply to all sets generated by the section). |
46 |
</para> |
47 |
<para> |
48 |
diff --git a/man/color.map.5 b/man/color.map.5 |
49 |
index 39f23f7..5543628 100644 |
50 |
--- a/man/color.map.5 |
51 |
+++ b/man/color.map.5 |
52 |
@@ -46,9 +46,6 @@ Defines color used for satisfied blockers. |
53 |
\fBPKG_MERGE\fR = \fI"darkgreen"\fR |
54 |
Defines color used for packages planned to be merged. |
55 |
.TP |
56 |
-\fBPKG_MERGE_USER_SET\fR = \fI"darkgreen"\fR |
57 |
-Defines color used for packages planned to be merged from a user defined set. |
58 |
-.TP |
59 |
\fBPKG_MERGE_SYSTEM\fR = \fI"darkgreen"\fR |
60 |
Defines color used for system packages planned to be merged. |
61 |
.TP |
62 |
@@ -58,10 +55,6 @@ Defines color used for world packages planned to be merged. |
63 |
\fBPKG_BINARY_MERGE\fR = \fI"purple"\fR |
64 |
Defines color used for packages planned to be merged using a binary package. |
65 |
.TP |
66 |
-\fBPKG_BINARY_MERGE_USER_SET\fR = \fI"purple"\fR |
67 |
-Defines color used for packages planned to be merged using a binary package |
68 |
-from a user defined set. |
69 |
-.TP |
70 |
\fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR |
71 |
Defines color used for system packages planned to be merged using a binary |
72 |
package. |
73 |
@@ -73,10 +66,6 @@ package. |
74 |
\fBPKG_NOMERGE\fR = \fI"darkblue"\fR |
75 |
Defines color used for packages not planned to be merged. |
76 |
.TP |
77 |
-\fBPKG_NOMERGE_USER_SET\fR = \fI"darkblue"\fR |
78 |
-Defines color used for packages not planned to be merged from a user defined |
79 |
-set. |
80 |
-.TP |
81 |
\fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR |
82 |
Defines color used for system packages not planned to be merged. |
83 |
.TP |
84 |
diff --git a/man/portage.5 b/man/portage.5 |
85 |
index 3cc1f07..7c2a8f7 100644 |
86 |
--- a/man/portage.5 |
87 |
+++ b/man/portage.5 |
88 |
@@ -1114,7 +1114,6 @@ class = portage.sets.files.StaticFileSet |
89 |
multiset = true |
90 |
directory = %(PORTAGE_CONFIGROOT)setc/portage/sets |
91 |
world-candidate = True |
92 |
-user-set = True |
93 |
|
94 |
[module-rebuild] |
95 |
class = portage.sets.dbapi.OwnerSet |
96 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
97 |
index 7c70a3e..400617d 100644 |
98 |
--- a/pym/_emerge/resolver/output.py |
99 |
+++ b/pym/_emerge/resolver/output.py |
100 |
@@ -271,8 +271,6 @@ class Display(object): |
101 |
return colorize("PKG_BINARY_MERGE_SYSTEM", pkg_str) |
102 |
elif pkg_info.world: |
103 |
return colorize("PKG_BINARY_MERGE_WORLD", pkg_str) |
104 |
- elif pkg_info.user_set: |
105 |
- return colorize("PKG_BINARY_MERGE_USER_SET", pkg_str) |
106 |
else: |
107 |
return colorize("PKG_BINARY_MERGE", pkg_str) |
108 |
else: |
109 |
@@ -280,8 +278,6 @@ class Display(object): |
110 |
return colorize("PKG_MERGE_SYSTEM", pkg_str) |
111 |
elif pkg_info.world: |
112 |
return colorize("PKG_MERGE_WORLD", pkg_str) |
113 |
- elif pkg_info.user_set: |
114 |
- return colorize("PKG_MERGE_USER_SET", pkg_str) |
115 |
else: |
116 |
return colorize("PKG_MERGE", pkg_str) |
117 |
elif pkg_info.operation == "uninstall": |
118 |
@@ -291,8 +287,6 @@ class Display(object): |
119 |
return colorize("PKG_NOMERGE_SYSTEM", pkg_str) |
120 |
elif pkg_info.world: |
121 |
return colorize("PKG_NOMERGE_WORLD", pkg_str) |
122 |
- elif pkg_info.user_set: |
123 |
- return colorize("PKG_NOMERGE_USER_SET", pkg_str) |
124 |
else: |
125 |
return colorize("PKG_NOMERGE", pkg_str) |
126 |
|
127 |
@@ -705,21 +699,18 @@ class Display(object): |
128 |
return |
129 |
|
130 |
|
131 |
- def check_sets(self, pkg): |
132 |
- """Checks for any occurances of the package in portage sets |
133 |
+ def check_system_world(self, pkg): |
134 |
+ """Checks for any occurances of the package in the system or world sets |
135 |
|
136 |
@param pkg: _emerge.Package.Package instance |
137 |
- @rtype user_set, system, and world booleans |
138 |
+ @rtype system and world booleans |
139 |
""" |
140 |
root_config = self.conf.roots[pkg.root] |
141 |
system_set = root_config.sets["system"] |
142 |
world_set = root_config.sets["selected"] |
143 |
- user_set = None |
144 |
- system = None |
145 |
- world = None |
146 |
+ system = False |
147 |
+ world = False |
148 |
try: |
149 |
- user_set = self.conf.user_sets[pkg.root].findAtomForPackage( |
150 |
- pkg, modified_use=self.conf.pkg_use_enabled(pkg)) |
151 |
system = system_set.findAtomForPackage( |
152 |
pkg, modified_use=self.conf.pkg_use_enabled(pkg)) |
153 |
world = world_set.findAtomForPackage( |
154 |
@@ -735,7 +726,7 @@ class Display(object): |
155 |
except InvalidDependString: |
156 |
# This is reported elsewhere if relevant. |
157 |
pass |
158 |
- return user_set, system, world |
159 |
+ return system, world |
160 |
|
161 |
|
162 |
@staticmethod |
163 |
@@ -872,8 +863,8 @@ class Display(object): |
164 |
self.oldlp = self.conf.columnwidth - 30 |
165 |
self.newlp = self.oldlp - 30 |
166 |
pkg_info.oldbest = self.convert_myoldbest(pkg, pkg_info) |
167 |
- pkg_info.user_set, pkg_info.system, pkg_info.world = \ |
168 |
- self.check_sets(pkg) |
169 |
+ pkg_info.system, pkg_info.world = \ |
170 |
+ self.check_system_world(pkg) |
171 |
if 'interactive' in pkg.properties and \ |
172 |
pkg.operation == 'merge': |
173 |
pkg_info.attr_display.interactive = True |
174 |
diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py |
175 |
index f3b2abc..70f7bc0 100644 |
176 |
--- a/pym/_emerge/resolver/output_helpers.py |
177 |
+++ b/pym/_emerge/resolver/output_helpers.py |
178 |
@@ -13,7 +13,6 @@ __all__ = ( |
179 |
import io |
180 |
import re |
181 |
import sys |
182 |
-from itertools import chain |
183 |
|
184 |
from portage import os |
185 |
from portage import _encodings, _unicode_encode |
186 |
@@ -214,14 +213,6 @@ class _DisplayConfig(object): |
187 |
self.running_root = frozen_config._running_root |
188 |
self.roots = frozen_config.roots |
189 |
|
190 |
- # Create a single merged user set for each root |
191 |
- self.user_sets = {} |
192 |
- for root_name, root in self.roots.items(): |
193 |
- self.user_sets[root_name] = InternalPackageSet(initial_atoms= \ |
194 |
- chain.from_iterable(pkgset.getAtoms() \ |
195 |
- for pkgset in root.sets.values() \ |
196 |
- if pkgset.user_set)) |
197 |
- |
198 |
self.blocker_parents = dynamic_config._blocker_parents |
199 |
self.reinstall_nodes = dynamic_config._reinstall_nodes |
200 |
self.digraph = dynamic_config.digraph |
201 |
@@ -605,8 +596,7 @@ class PkgInfo(object): |
202 |
__slots__ = ("attr_display", "built", "cp", |
203 |
"ebuild_path", "fetch_symbol", "merge", |
204 |
"oldbest", "oldbest_list", "operation", "ordered", "previous_pkg", |
205 |
- "repo_name", "repo_path_real", "user_set", "slot", "sub_slot", |
206 |
- "system", "use", "ver", "world") |
207 |
+ "repo_name", "repo_path_real", "slot", "sub_slot", "system", "use", "ver", "world") |
208 |
|
209 |
|
210 |
def __init__(self): |
211 |
@@ -622,13 +612,12 @@ class PkgInfo(object): |
212 |
self.previous_pkg = None |
213 |
self.repo_path_real = '' |
214 |
self.repo_name = '' |
215 |
- self.user_set = None |
216 |
self.slot = '' |
217 |
self.sub_slot = '' |
218 |
- self.system = None |
219 |
+ self.system = False |
220 |
self.use = '' |
221 |
self.ver = '' |
222 |
- self.world = None |
223 |
+ self.world = False |
224 |
self.attr_display = PkgAttrDisplay() |
225 |
|
226 |
class PkgAttrDisplay(SlotObject): |
227 |
diff --git a/pym/portage/_sets/__init__.py b/pym/portage/_sets/__init__.py |
228 |
index 6d69bda..2c9bf97 100644 |
229 |
--- a/pym/portage/_sets/__init__.py |
230 |
+++ b/pym/portage/_sets/__init__.py |
231 |
@@ -117,7 +117,6 @@ class SetConfig(object): |
232 |
parser.set("usersets", "multiset", "true") |
233 |
parser.set("usersets", "directory", "%(PORTAGE_CONFIGROOT)setc/portage/sets") |
234 |
parser.set("usersets", "world-candidate", "true") |
235 |
- parser.set("usersets", "user-set", "true") |
236 |
|
237 |
parser.remove_section("live-rebuild") |
238 |
parser.add_section("live-rebuild") |
239 |
@@ -146,7 +145,6 @@ class SetConfig(object): |
240 |
if not setname in self.psets: |
241 |
options["name"] = setname |
242 |
options["world-candidate"] = "False" |
243 |
- options["user-set"] = "False" |
244 |
|
245 |
# for the unlikely case that there is already a section with the requested setname |
246 |
import random |
247 |
@@ -215,9 +213,6 @@ class SetConfig(object): |
248 |
if parser.has_option(sname, "world-candidate") and \ |
249 |
parser.getboolean(sname, "world-candidate"): |
250 |
newsets[x].world_candidate = True |
251 |
- if parser.has_option(sname, "user-set") and \ |
252 |
- parser.getboolean(sname, "user-set"): |
253 |
- newsets[x].user_set = True |
254 |
self.psets.update(newsets) |
255 |
else: |
256 |
self.errors.append(_("Section '%(section)s' is configured as multiset, but '%(class)s' " |
257 |
@@ -237,9 +232,6 @@ class SetConfig(object): |
258 |
if parser.has_option(sname, "world-candidate") and \ |
259 |
parser.getboolean(sname, "world-candidate"): |
260 |
self.psets[setname].world_candidate = True |
261 |
- if parser.has_option(sname, "user-set") and \ |
262 |
- parser.getboolean(sname, "user-set"): |
263 |
- self.psets[setname].user_set = True |
264 |
except SetConfigError as e: |
265 |
self.errors.append(_("Configuration error in section '%s': %s") % (sname, str(e))) |
266 |
continue |
267 |
diff --git a/pym/portage/_sets/base.py b/pym/portage/_sets/base.py |
268 |
index 7be9aab..ee20d36 100644 |
269 |
--- a/pym/portage/_sets/base.py |
270 |
+++ b/pym/portage/_sets/base.py |
271 |
@@ -28,7 +28,6 @@ class PackageSet(object): |
272 |
self.errors = [] |
273 |
self._nonatoms = set() |
274 |
self.world_candidate = False |
275 |
- self.user_set = False |
276 |
self._allow_wildcard = allow_wildcard |
277 |
self._allow_repo = allow_repo |
278 |
|
279 |
diff --git a/pym/portage/output.py b/pym/portage/output.py |
280 |
index 80c67e8..bb7542b 100644 |
281 |
--- a/pym/portage/output.py |
282 |
+++ b/pym/portage/output.py |
283 |
@@ -128,27 +128,24 @@ _styles["HILITE"] = ( "teal", ) |
284 |
_styles["BRACKET"] = ( "blue", ) |
285 |
|
286 |
# Portage functions |
287 |
-_styles["INFORM"] = ( "darkgreen", ) |
288 |
-_styles["UNMERGE_WARN"] = ( "red", ) |
289 |
-_styles["SECURITY_WARN"] = ( "red", ) |
290 |
-_styles["MERGE_LIST_PROGRESS"] = ( "yellow", ) |
291 |
-_styles["PKG_BLOCKER"] = ( "red", ) |
292 |
-_styles["PKG_BLOCKER_SATISFIED"] = ( "darkblue", ) |
293 |
-_styles["PKG_MERGE"] = ( "darkgreen", ) |
294 |
-_styles["PKG_MERGE_USER_SET"] = ( "darkgreen", ) |
295 |
-_styles["PKG_MERGE_SYSTEM"] = ( "darkgreen", ) |
296 |
-_styles["PKG_MERGE_WORLD"] = ( "green", ) |
297 |
-_styles["PKG_BINARY_MERGE"] = ( "purple", ) |
298 |
-_styles["PKG_BINARY_MERGE_USER_SET"] = ( "purple", ) |
299 |
-_styles["PKG_BINARY_MERGE_SYSTEM"] = ( "purple", ) |
300 |
-_styles["PKG_BINARY_MERGE_WORLD"] = ( "fuchsia", ) |
301 |
-_styles["PKG_UNINSTALL"] = ( "red", ) |
302 |
-_styles["PKG_NOMERGE"] = ( "darkblue", ) |
303 |
-_styles["PKG_NOMERGE_USER_SET"] = ( "darkblue", ) |
304 |
-_styles["PKG_NOMERGE_SYSTEM"] = ( "darkblue", ) |
305 |
-_styles["PKG_NOMERGE_WORLD"] = ( "blue", ) |
306 |
-_styles["PROMPT_CHOICE_DEFAULT"] = ( "green", ) |
307 |
-_styles["PROMPT_CHOICE_OTHER"] = ( "red", ) |
308 |
+_styles["INFORM"] = ( "darkgreen", ) |
309 |
+_styles["UNMERGE_WARN"] = ( "red", ) |
310 |
+_styles["SECURITY_WARN"] = ( "red", ) |
311 |
+_styles["MERGE_LIST_PROGRESS"] = ( "yellow", ) |
312 |
+_styles["PKG_BLOCKER"] = ( "red", ) |
313 |
+_styles["PKG_BLOCKER_SATISFIED"] = ( "darkblue", ) |
314 |
+_styles["PKG_MERGE"] = ( "darkgreen", ) |
315 |
+_styles["PKG_MERGE_SYSTEM"] = ( "darkgreen", ) |
316 |
+_styles["PKG_MERGE_WORLD"] = ( "green", ) |
317 |
+_styles["PKG_BINARY_MERGE"] = ( "purple", ) |
318 |
+_styles["PKG_BINARY_MERGE_SYSTEM"] = ( "purple", ) |
319 |
+_styles["PKG_BINARY_MERGE_WORLD"] = ( "fuchsia", ) |
320 |
+_styles["PKG_UNINSTALL"] = ( "red", ) |
321 |
+_styles["PKG_NOMERGE"] = ( "darkblue", ) |
322 |
+_styles["PKG_NOMERGE_SYSTEM"] = ( "darkblue", ) |
323 |
+_styles["PKG_NOMERGE_WORLD"] = ( "blue", ) |
324 |
+_styles["PROMPT_CHOICE_DEFAULT"] = ( "green", ) |
325 |
+_styles["PROMPT_CHOICE_OTHER"] = ( "red", ) |
326 |
|
327 |
def _parse_color_map(config_root='/', onerror=None): |
328 |
""" |
329 |
-- |
330 |
2.7.3 |