From 307678b58c9f3fad5b52fbc3807751f63d20db43 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Nov 2009 00:25:48 +0000 Subject: Tweak logic from previous commit. svn path=/main/trunk/; revision=14858 --- pym/_emerge/depgraph.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 77fff2aa..dc7b7da8 100644 --- 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()) -- cgit v1.2.3-65-gdbad