From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Nov 2009 04:06:07 +0000 (-0000)
Subject: Tweak logic from previous commit. (trunk r14858)
X-Git-Tag: v2.1.7.6~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04f54351ecbc2d93b52faad931f22d2eb8b238ee;p=portage.git

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 6369e0eae..39dc8dc9f 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())