Display: align blocker and nomerge nodes

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 99930b28db64afd6099a8ddad8d0b7cfb70b39d5..3346c07829b12db03e144d6688a5df84162a12a6 100644 (file)
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -85,6 +85,9 @@ class Display(object):
                        self.blocker_style = "PKG_BLOCKER"
                        addl = "%s  %s  " % (colorize(self.blocker_style, "B"),
                                fetch_symbol)
+               if self.conf.verbosity == 3:
+                       # add column for mask status
+                       addl += " "
                self.resolved = dep_expand(
                        str(pkg.atom).lstrip("!"), mydb=self.vardb,
                        settings=self.pkgsettings
@@ -815,9 +818,13 @@ class Display(object):
                                                        addl, pkg_info, pkg)
                                        else:
                                                if not pkg_info.merge:
-                                                       myprint = "[%s] " % (
+                                                       addl = ""
+                                                       if self.conf.verbosity == 3:
+                                                                # add column for mask status
+                                                               addl += " "
+                                                       myprint = "[%s%s] " % (
                                                                self.pkgprint(pkg_info.operation.ljust(13),
-                                                               pkg_info)
+                                                               pkg_info), addl,
                                                                )
                                                else:
                                                        myprint = "[%s %s] " % (