diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:06:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-21 04:06:07 +0000 |
| commit | 04f54351ecbc2d93b52faad931f22d2eb8b238ee (patch) | |
| tree | ab2d865f37d47871443f4dcbdc16e8cc82ccd4b1 /pym | |
| parent | In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be (diff) | |
| download | portage-multirepo-04f54351ecbc2d93b52faad931f22d2eb8b238ee.tar.gz portage-multirepo-04f54351ecbc2d93b52faad931f22d2eb8b238ee.tar.bz2 portage-multirepo-04f54351ecbc2d93b52faad931f22d2eb8b238ee.zip | |
Tweak logic from previous commit. (trunk r14858)
svn path=/main/branches/2.1.7/; revision=14869
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 6369e0ea..39dc8dc9 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()) |