diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-09-28 22:28:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-09-28 22:28:19 +0000 |
| commit | 7f96f227fc8227bc9e0e11e70183ba5bc9049fa2 (patch) | |
| tree | 5489944d16e593569bd2de425e9dcb1a3be7d0ac | |
| parent | ceb5fc5058cc7595ac30f08d912ff3544d0639fb (diff) | |
| download | portage-7f96f227fc8227bc9e0e11e70183ba5bc9049fa2.tar.gz portage-7f96f227fc8227bc9e0e11e70183ba5bc9049fa2.tar.bz2 portage-7f96f227fc8227bc9e0e11e70183ba5bc9049fa2.zip | |
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
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index f533a0eb6..000f2f6dc 100644 --- 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 \ |