From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 18 Mar 2013 21:27:57 +0000 (-0700)
Subject: Display._blockers(): distinguish hard blocking
X-Git-Tag: v2.2.0_alpha167~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a95dc1d79de9560833df93d46918446a7f10367c;p=portage.git

Display._blockers(): distinguish hard blocking
---

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 93a896d4a..46a13bf6a 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)