From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 31 Jan 2011 08:34:20 +0000 (-0800)
Subject: Display: align blocker and nomerge nodes
X-Git-Tag: v2.2.0_alpha20~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5468bd609133a2cdf172e880b103dc8bc6f8c24a;p=portage.git

Display: align blocker and nomerge nodes
---

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 99930b28d..3346c0782 100644
--- 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] " % (