From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q01Cy-0002PK-00 for garchives@archives.gentoo.org; Thu, 17 Mar 2011 00:36:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84E681C07D; Thu, 17 Mar 2011 00:36:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 578B01C07D for ; Thu, 17 Mar 2011 00:36:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA81C1B43C3 for ; Thu, 17 Mar 2011 00:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 521498006A for ; Thu, 17 Mar 2011 00:36:47 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <282263a511d13b62e3c4d0636011f486b1eeb588.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 282263a511d13b62e3c4d0636011f486b1eeb588 Date: Thu, 17 Mar 2011 00:36:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 953be35f7a978478c1ab65a6aa53b868 commit: 282263a511d13b62e3c4d0636011f486b1eeb588 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 17 00:36:36 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 17 00:36:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D282263a5 Scheduler: terminate _merge_wait_queue --- pym/_emerge/Scheduler.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 6c24604..b961e83 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -300,6 +300,10 @@ class Scheduler(PollScheduler): # them and their start/exit handlers won't be called. for build in self._task_queues.jobs._task_queue: self._running_tasks.remove(build.pkg) + if self._merge_wait_queue: + for merge in self._merge_wait_queue: + self._running_tasks.remove(merge.merge.pkg) + del self._merge_wait_queue[:] for merge in self._task_queues.merge._task_queue: # Setup phases may be scheduled in this queue, but # we're only interested in the PackageMerge instances.