summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-10 08:47:45 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-10 08:47:45 +0000
commit8780575a0bb9a45a40681210ec8ca489aaa8c791 (patch)
treef90d920513f87c462f09ea8caed24dcb1e36eee0
parent16c494ec54475a4339e93e2c4e4447d5f9f5e029 (diff)
downloadportage-8780575a0bb9a45a40681210ec8ca489aaa8c791.tar.gz
portage-8780575a0bb9a45a40681210ec8ca489aaa8c791.tar.bz2
portage-8780575a0bb9a45a40681210ec8ca489aaa8c791.zip
Always include satisfied blockers as an indicator that blocking
packages will be temporarily installed simultaneously. svn path=/main/trunk/; revision=10281
-rw-r--r--pym/_emerge/__init__.py14
1 files changed, 8 insertions, 6 deletions
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))