Don't colorize system package when in "world" mode.
authorZac Medico <zmedico@gentoo.org>
Thu, 28 Jun 2007 09:01:17 +0000 (09:01 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 28 Jun 2007 09:01:17 +0000 (09:01 -0000)
svn path=/main/trunk/; revision=7076

pym/emerge/__init__.py

index 62ea9c9077343a239211cdbdac705d8757f4e747..8fbf994b2bc0d20b6b5ca1aa45315a15b7c48aa3 100644 (file)
@@ -2847,9 +2847,11 @@ class depgraph(object):
                                        world_nodes = self._sets_nodes.get("world")
                                        if world_nodes and pkg_node in world_nodes:
                                                pkg_world = True
-                                       system_nodes = self._sets_nodes.get("system")
-                                       if system_nodes and pkg_node in system_nodes:
-                                               pkg_system = True
+                                       if world_nodes is None:
+                                               # Don't colorize system package when in "world" mode.
+                                               system_nodes = self._sets_nodes.get("system")
+                                               if system_nodes and pkg_node in system_nodes:
+                                                       pkg_system = True
 
                                def pkgprint(pkg):
                                        if pkg_merge: