| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-28 22:28:19 +0000 (Sun, 28 Sep 2008) |
| 3 |
New Revision: 11594 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
For compatibility with long-standing --columns behavior, do not display |
| 9 |
"uninstall" or satsified "blocks" nodes in the merge list when --columns |
| 10 |
is enabled. Thanks to solar for the suggestion. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-09-28 19:15:43 UTC (rev 11593) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-09-28 22:28:19 UTC (rev 11594) |
| 17 |
@@ -6698,6 +6698,7 @@ |
| 18 |
favorites_set = InternalPackageSet(favorites) |
| 19 |
oneshot = "--oneshot" in self.myopts or \ |
| 20 |
"--onlydeps" in self.myopts |
| 21 |
+ columns = "--columns" in self.myopts |
| 22 |
changelogs=[] |
| 23 |
p=[] |
| 24 |
blockers = [] |
| 25 |
@@ -6973,6 +6974,8 @@ |
| 26 |
addl += colorize(blocker_style, |
| 27 |
" (is blocking %s)") % block_parents |
| 28 |
if isinstance(x, Blocker) and x.satisfied: |
| 29 |
+ if columns: |
| 30 |
+ continue |
| 31 |
p.append(addl) |
| 32 |
else: |
| 33 |
blockers.append(addl) |
| 34 |
@@ -7360,6 +7363,8 @@ |
| 35 |
(pkgprint(pkg_type), addl, indent, |
| 36 |
pkgprint(pkg.cpv), myoldbest) |
| 37 |
|
| 38 |
+ if columns and pkg.operation == "uninstall": |
| 39 |
+ continue |
| 40 |
p.append((myprint, verboseadd, repoadd)) |
| 41 |
|
| 42 |
if "--tree" not in self.myopts and \ |
Archives