From 8780575a0bb9a45a40681210ec8ca489aaa8c791 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 May 2008 08:47:45 +0000 Subject: Always include satisfied blockers as an indicator that blocking packages will be temporarily installed simultaneously. svn path=/main/trunk/; revision=10281 --- pym/_emerge/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index a18f5255b..f4ce23843 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4042,12 +4042,14 @@ class depgraph(object): retlist.append(node) - if isinstance(node, Package) and \ - "uninstall" == node.operation: - # Include satisfied blockers in the merge list so - # that the user can see why the package had to be - # uninstalled in advance rather than through - # replacement. + if (isinstance(node, Package) and \ + "uninstall" == node.operation) or \ + (uninst_task is not None and \ + uninst_task in scheduled_uninstalls): + # Include satisfied blockers in the merge list + # since the user might be interested and also + # it serves as an indicator that blocking packages + # will be temporarily installed simultaneously. for blocker in solved_blockers: retlist.append(Blocker(atom=blocker.atom, root=blocker.root, satisfied=True)) -- cgit v1.2.3-1-g7c22