From 7b068c5490849e50bba2ec25d0eb9e199d66ac8d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 May 2008 08:48:15 +0000 Subject: Always include satisfied blockers as an indicator that blocking packages will be temporarily installed simultaneously. (trunk r10281) svn path=/main/branches/2.1.2/; revision=10282 --- bin/emerge | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 0ab37b6c5..91618ecc9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4194,12 +4194,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