1 |
Packages belonging to a set in world_sets will now be colorized using |
2 |
as a world package. |
3 |
|
4 |
X-Gentoo-bug: 583164 |
5 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583164 |
6 |
--- |
7 |
pym/_emerge/resolver/output.py | 2 +- |
8 |
pym/_emerge/resolver/output_helpers.py | 11 +++++++++++ |
9 |
2 files changed, 12 insertions(+), 1 deletion(-) |
10 |
|
11 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
12 |
index 400617d..ac979f6 100644 |
13 |
--- a/pym/_emerge/resolver/output.py |
14 |
+++ b/pym/_emerge/resolver/output.py |
15 |
@@ -707,7 +707,7 @@ class Display(object): |
16 |
""" |
17 |
root_config = self.conf.roots[pkg.root] |
18 |
system_set = root_config.sets["system"] |
19 |
- world_set = root_config.sets["selected"] |
20 |
+ world_set = self.conf.selected_sets[pkg.root] |
21 |
system = False |
22 |
world = False |
23 |
try: |
24 |
diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py |
25 |
index 70f7bc0..c18832a 100644 |
26 |
--- a/pym/_emerge/resolver/output_helpers.py |
27 |
+++ b/pym/_emerge/resolver/output_helpers.py |
28 |
@@ -17,6 +17,7 @@ import sys |
29 |
from portage import os |
30 |
from portage import _encodings, _unicode_encode |
31 |
from portage._sets.base import InternalPackageSet |
32 |
+from portage.exception import PackageSetNotFound |
33 |
from portage.localization import localized_size |
34 |
from portage.output import (blue, bold, colorize, create_color_func, |
35 |
green, red, teal, turquoise, yellow) |
36 |
@@ -213,6 +214,16 @@ class _DisplayConfig(object): |
37 |
self.running_root = frozen_config._running_root |
38 |
self.roots = frozen_config.roots |
39 |
|
40 |
+ # Create a set of selected packages for each root |
41 |
+ self.selected_sets = {} |
42 |
+ for root_name, root in self.roots.items(): |
43 |
+ try: |
44 |
+ self.selected_sets[root_name] = InternalPackageSet( \ |
45 |
+ initial_atoms=root.setconfig.getSetAtoms("selected")) |
46 |
+ except PackageSetNotFound: |
47 |
+ # A nested set could not be resolved, so ignore nested sets. |
48 |
+ self.selected_sets[root_name] = root.sets["selected"] |
49 |
+ |
50 |
self.blocker_parents = dynamic_config._blocker_parents |
51 |
self.reinstall_nodes = dynamic_config._reinstall_nodes |
52 |
self.digraph = dynamic_config.digraph |
53 |
-- |
54 |
2.7.3 |