diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-03-18 14:27:57 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-03-18 14:27:57 -0700 |
| commit | a95dc1d79de9560833df93d46918446a7f10367c (patch) | |
| tree | 09f5b1db27f461dd47a8c6f1e438295e1e4a94bb | |
| parent | resolver/output: rename Display._blockers() param (diff) | |
| download | portage-a95dc1d79de9560833df93d46918446a7f10367c.tar.gz portage-a95dc1d79de9560833df93d46918446a7f10367c.tar.bz2 portage-a95dc1d79de9560833df93d46918446a7f10367c.zip | |
Display._blockers(): distinguish hard blocking
| -rw-r--r-- | 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 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) |