Make --columns blockers output more consistent when --quiet is not enabled.

svn path=/main/trunk/; revision=5294

diff --git a/bin/emerge b/bin/emerge
index b899ea6569e6fc9832cfa8ff7c2cf472f73e879e..646aada405a3bd0a57d47e57256a8cd478b09cc4 100755 (executable)
--- 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),