handle --cols when displaying blockers

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

diff --git a/bin/emerge b/bin/emerge
index f820a349172158b381b3daac39d70fe3aee9f253..1b3aca4b35b74694ad8875d0c05f7ee783d5a931 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2009,7 +2009,10 @@ class depgraph:
                                counters.blocks += 1
                                resolved = portage.key_expand(
                                        pkg_key, mydb=vardb, settings=pkgsettings)
-                               print "["+x[0]+" "+addl+"]",red(resolved),
+                               if ("--columns" in self.myopts):
+                                       print addl,red(resolved),
+                               else:
+                                       print "["+x[0]+" "+addl+"]",red(resolved),
                                block_parents = self.blocker_parents[tuple(x)]
                                block_parents = set([pnode[2] for pnode in block_parents])
                                block_parents = ", ".join(block_parents)