From: Zac Medico Date: Sat, 21 Nov 2009 00:19:14 +0000 (-0000) Subject: In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be X-Git-Tag: v2.2_rc51~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0abcfd76c0a2e246bb759eaf73bc2af0d453b16;p=portage.git 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 cfd06fca0..77fff2aa0 100644 --- 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())