summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-21 04:05:40 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-21 04:05:40 +0000
commitb87e7e5bd3d4cad1556f178d72a520ce26d120d5 (patch)
tree2b828a981f6c1867cec899458f3a93c926941bed
parentBug #293730 - Fix bad || choices triggered in some cases inside (diff)
downloadportage-multirepo-b87e7e5bd3d4cad1556f178d72a520ce26d120d5.tar.gz
portage-multirepo-b87e7e5bd3d4cad1556f178d72a520ce26d120d5.tar.bz2
portage-multirepo-b87e7e5bd3d4cad1556f178d72a520ce26d120d5.zip
Fix depgraph._prune_tree_display() to preserve uninstall tasks. Thanks to
Jonathan Callen <abcd@g.o> for reporting. (trunk r14855) svn path=/main/branches/2.1.7/; revision=14866
-rw-r--r--pym/_emerge/depgraph.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2cb10650..53b39f6c 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4738,7 +4738,7 @@ class depgraph(object):
del display_list[i]
continue
if ordered and isinstance(node, Package) \
- and node.operation == 'merge':
+ and node.operation in ('merge', 'uninstall'):
last_merge_depth = depth
continue
if depth >= last_merge_depth or \