Tweak logic from previous commit. (trunk r14858)

svn path=/main/branches/2.1.7/; revision=14869

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 6369e0eae4d8cff99f3cce6812b32536aa3c5520..39dc8dc9fc7c1882d6646cc9e6fa236c8a16b4ca 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3759,7 +3759,9 @@ class depgraph(object):
                                        for blocker in blocker_nodes:
                                                if not myblocker_uninstalls.child_nodes(blocker):
                                                        myblocker_uninstalls.remove(blocker)
-                                                       solved_blockers.add(blocker)
+                                                       if blocker not in \
+                                                               self._dynamic_config._unsolvable_blockers:
+                                                               solved_blockers.add(blocker)
 
                                retlist.append(node)
 
@@ -3772,9 +3774,7 @@ class depgraph(object):
                                        # it serves as an indicator that blocking packages
                                        # will be temporarily installed simultaneously.
                                        for blocker in solved_blockers:
-                                               if blocker not in \
-                                                       self._dynamic_config._unsolvable_blockers:
-                                                       blocker.satisfied = True
+                                               blocker.satisfied = True
                                                retlist.append(blocker)
 
                unsolvable_blockers = set(self._dynamic_config._unsolvable_blockers.leaf_nodes())