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 138da45f975507355138f5cbba3f6867c212ed57..6369e0eae4d8cff99f3cce6812b32536aa3c5520 100644 (file)
--- 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())