diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:05:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:05:58 +0000 |
| commit | 474d511e46c09df89efe4cd6821fe29e5e0a9b2b (patch) | |
| tree | a6a1852a18db44efeb92667769d9884d63862364 /pym | |
| parent | 239d43292a07f7086132695c1cb2943fc782224c (diff) | |
| download | portage-474d511e46c09df89efe4cd6821fe29e5e0a9b2b.tar.gz portage-474d511e46c09df89efe4cd6821fe29e5e0a9b2b.tar.bz2 portage-474d511e46c09df89efe4cd6821fe29e5e0a9b2b.zip | |
In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be
accidentally marked as satisfied. (trunk r14857)
svn path=/main/branches/2.1.7/; revision=14868
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 138da45f9..6369e0eae 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()) |