diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-13 22:13:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-13 22:13:52 +0000 |
| commit | 31cda992011ad3773daf63b2a73c1176e3ac909c (patch) | |
| tree | 9fdb456a72218886f9f6952e2d0e3bfc43aa314d /pym | |
| parent | 7e3e07c2fd452c30d846518bdd94129a1594f526 (diff) | |
| download | portage-31cda992011ad3773daf63b2a73c1176e3ac909c.tar.gz portage-31cda992011ad3773daf63b2a73c1176e3ac909c.tar.bz2 portage-31cda992011ad3773daf63b2a73c1176e3ac909c.zip | |
Ensure that that Scheduler._main_loop() doesn't return before the merge
queue is empty.
svn path=/main/trunk/; revision=11042
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2375546cf..b3f06aaba 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8878,11 +8878,13 @@ class Scheduler(PollScheduler): if self._is_restart_scheduled(): self._set_max_jobs(1) + merge_queue = self._task_queues.merge + while not self._failed_pkgs and \ self._schedule(): self._poll_loop() - while self._jobs: + while self._jobs or merge_queue: self._poll_loop() def _schedule_tasks(self): |