For compatibility with long-standing --columns behavior, do not display

"uninstall" or satsified "blocks" nodes in the merge list when --columns
is enabled. Thanks to solar for the suggestion.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f533a0eb6b19a71208ea3bf39c5f1da96a493b0a..000f2f6dcabbe5637e2e96c84a60f94b872100b3 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6698,6 +6698,7 @@ class depgraph(object):
                favorites_set = InternalPackageSet(favorites)
                oneshot = "--oneshot" in self.myopts or \
                        "--onlydeps" in self.myopts
+               columns = "--columns" in self.myopts
                changelogs=[]
                p=[]
                blockers = []
@@ -6973,6 +6974,8 @@ class depgraph(object):
                                        addl += colorize(blocker_style,
                                                " (is blocking %s)") % block_parents
                                if isinstance(x, Blocker) and x.satisfied:
+                                       if columns:
+                                               continue
                                        p.append(addl)
                                else:
                                        blockers.append(addl)
@@ -7360,6 +7363,8 @@ class depgraph(object):
                                                                (pkgprint(pkg_type), addl, indent,
                                                                pkgprint(pkg.cpv), myoldbest)
 
+                               if columns and pkg.operation == "uninstall":
+                                       continue
                                p.append((myprint, verboseadd, repoadd))
 
                                if "--tree" not in self.myopts and \