From 10171573b2dc7e3284004bdb67b7862cb9a1999d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Dec 2006 07:21:12 +0000
Subject: Make --columns blockers output more consistent when --quiet is not
 enabled.

svn path=/main/trunk/; revision=5294
---
 bin/emerge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index b899ea656..646aada40 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2041,7 +2041,7 @@ class depgraph:
 				counters.blocks += 1
 				resolved = portage.key_expand(
 					pkg_key, mydb=vardb, settings=pkgsettings)
-				if ("--columns" in self.myopts):
+				if "--columns" in self.myopts and "--quiet" in self.myopts:
 					print addl,red(resolved),
 				else:
 					print "["+x[0]+" "+addl+"]",red(resolved),
-- 
cgit v1.2.3-1-g7c22