From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Nov 2009 04:05:58 +0000 (-0000)
Subject: In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be
X-Git-Tag: v2.1.7.6~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=474d511e46c09df89efe4cd6821fe29e5e0a9b2b;p=portage.git

In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be
accidentally marked as satisfied. (trunk r14857)

svn path=/main/branches/2.1.7/; revision=14868
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 138da45f9..6369e0eae 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3772,7 +3772,9 @@ class depgraph(object):
 					# it serves as an indicator that blocking packages
 					# will be temporarily installed simultaneously.
 					for blocker in solved_blockers:
-						blocker.satisfied = True
+						if blocker not in \
+							self._dynamic_config._unsolvable_blockers:
+							blocker.satisfied = True
 						retlist.append(blocker)
 
 		unsolvable_blockers = set(self._dynamic_config._unsolvable_blockers.leaf_nodes())