From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1E1B2138283 for ; Fri, 27 May 2016 08:33:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73CC5224042; Fri, 27 May 2016 08:33:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05E21224042 for ; Fri, 27 May 2016 08:33:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95DB7340A9E for ; Fri, 27 May 2016 08:33:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1300BAA2 for ; Fri, 27 May 2016 08:33:10 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1464337394.40cdc1c3f467ac94d3a966777eb6a0907c269550.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output.py pym/_emerge/resolver/output_helpers.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: 40cdc1c3f467ac94d3a966777eb6a0907c269550 X-VCS-Branch: master Date: Fri, 27 May 2016 08:33:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70d4d6c4-cbaf-438e-8631-60da487701a3 X-Archives-Hash: b3524f24f263221210050130b6f3565d commit: 40cdc1c3f467ac94d3a966777eb6a0907c269550 Author: Adam Mills armills info> AuthorDate: Wed May 25 16:12:57 2016 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Fri May 27 08:23:14 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=40cdc1c3 Colorize packages in world_sets (bug 583164) Packages belonging to a set listed in world_sets will now be colorized as a world package. X-Gentoo-bug: 583164 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583164 Acked-by: Alexander Berntsen gentoo.org> Acked-by: Zac Medico gentoo.org> Signed-off-by: Alexander Berntsen gentoo.org> pym/_emerge/resolver/output.py | 2 +- pym/_emerge/resolver/output_helpers.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 400617d..ac979f6 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -707,7 +707,7 @@ class Display(object): """ root_config = self.conf.roots[pkg.root] system_set = root_config.sets["system"] - world_set = root_config.sets["selected"] + world_set = self.conf.selected_sets[pkg.root] system = False world = False try: diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index 70f7bc0..b83717e 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -17,6 +17,7 @@ import sys from portage import os from portage import _encodings, _unicode_encode from portage._sets.base import InternalPackageSet +from portage.exception import PackageSetNotFound from portage.localization import localized_size from portage.output import (blue, bold, colorize, create_color_func, green, red, teal, turquoise, yellow) @@ -213,6 +214,16 @@ class _DisplayConfig(object): self.running_root = frozen_config._running_root self.roots = frozen_config.roots + # Create a set of selected packages for each root + self.selected_sets = {} + for root_name, root in self.roots.items(): + try: + self.selected_sets[root_name] = InternalPackageSet( + initial_atoms=root.setconfig.getSetAtoms("selected")) + except PackageSetNotFound: + # A nested set could not be resolved, so ignore nested sets. + self.selected_sets[root_name] = root.sets["selected"] + self.blocker_parents = dynamic_config._blocker_parents self.reinstall_nodes = dynamic_config._reinstall_nodes self.digraph = dynamic_config.digraph