From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 31 Jan 2011 08:43:52 +0000 (-0800)
Subject: Display: align nomerge nodes more
X-Git-Tag: v2.2.0_alpha20~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22c952cdc35e5183237029e72dadbe1365e2b110;p=portage.git

Display: align nomerge nodes more
---

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 3346c0782..be07656a4 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -436,9 +436,13 @@ class Display(object):
 			self.verboseadd = None
 		else:
 			if not pkg_info.merge:
-				myprint = "[%s] %s%s" % \
+				addl = ""
+				if self.conf.verbosity == 3:
+					# add column for mask status
+					addl += " "
+				myprint = "[%s%s] %s%s" % \
 					(self.pkgprint(pkg_info.operation.ljust(13), pkg_info),
-					self.indent, self.pkgprint(pkg.cp, pkg_info))
+					addl, self.indent, self.pkgprint(pkg.cp, pkg_info))
 			else:
 				myprint = "[%s %s] %s%s" % \
 					(self.pkgprint(pkg.type_name, pkg_info), addl,
@@ -461,9 +465,13 @@ class Display(object):
 		@rtype the updated addl
 		"""
 		if not pkg_info.merge:
-			myprint = "[%s] %s%s %s" % \
+			addl = ""
+			if self.conf.verbosity == 3:
+				# add column for mask status
+				addl += " "
+			myprint = "[%s%s] %s%s %s" % \
 				(self.pkgprint(pkg_info.operation.ljust(13),
-				pkg_info),
+				pkg_info), addl,
 				self.indent, self.pkgprint(pkg.cpv, pkg_info),
 				pkg_info.oldbest)
 		else: