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 BF249198005 for ; Mon, 18 Mar 2013 21:28:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C660E0123; Mon, 18 Mar 2013 21:28:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E20F6E0123 for ; Mon, 18 Mar 2013 21:28:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A319533DAF8 for ; Mon, 18 Mar 2013 21:28:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 11374E4073 for ; Mon, 18 Mar 2013 21:28:09 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363642077.a95dc1d79de9560833df93d46918446a7f10367c.zmedico@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 X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a95dc1d79de9560833df93d46918446a7f10367c X-VCS-Branch: master Date: Mon, 18 Mar 2013 21:28:09 +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: 448fc412-aedf-4b14-9d5b-9fb91484f8a9 X-Archives-Hash: f6a063912dd0c7c7872aa3ff53ca13aa commit: a95dc1d79de9560833df93d46918446a7f10367c Author: Zac Medico gentoo org> AuthorDate: Mon Mar 18 21:27:57 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Mar 18 21:27:57 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a95dc1d7 Display._blockers(): distinguish hard blocking --- pym/_emerge/resolver/output.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 93a896d..46a13bf 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -100,13 +100,18 @@ class Display(object): block_parents = self.conf.blocker_parents.parent_nodes(blocker) block_parents = set(_unicode(pnode.cpv) for pnode in block_parents) block_parents = ", ".join(block_parents) + if blocker.atom.blocker.overlap.forbid: + blocking_desc = "hard blocking" + else: + blocking_desc = "blocking" if self.resolved != blocker.atom: addl += colorize(self.blocker_style, - " (\"%s\" is blocking %s)") % \ - (_unicode(blocker.atom).lstrip("!"), block_parents) + " (\"%s\" is %s %s)" % + (_unicode(blocker.atom).lstrip("!"), + blocking_desc, block_parents)) else: addl += colorize(self.blocker_style, - " (is blocking %s)") % block_parents + " (is %s %s)" % (blocking_desc, block_parents)) if blocker.satisfied: if not self.conf.columns: self.print_msg.append(addl)