In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be

accidentally marked as satisfied.

svn path=/main/trunk/; revision=14857

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index cfd06fca09bfe777faa1e81555a2d6dc5f778cba..77fff2aa096e0b2f179b79f95b6583ed8ec0237b 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())