diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-11-21 00:19:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-21 00:19:14 +0000 |
| commit | b0abcfd76c0a2e246bb759eaf73bc2af0d453b16 (patch) | |
| tree | bba633bbcb43406f5c0ddc35656cb772daad5f55 /pym | |
| parent | 6b4bf5bf0a8e5dfd3a4a5db51f790d790f982795 (diff) | |
| download | portage-b0abcfd76c0a2e246bb759eaf73bc2af0d453b16.tar.gz portage-b0abcfd76c0a2e246bb759eaf73bc2af0d453b16.tar.bz2 portage-b0abcfd76c0a2e246bb759eaf73bc2af0d453b16.zip | |
In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be
accidentally marked as satisfied.
svn path=/main/trunk/; revision=14857
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 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()) |