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 1QjGqP-0005Rs-M3 for garchives@archives.gentoo.org; Tue, 19 Jul 2011 20:24:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E14321C2EF; Tue, 19 Jul 2011 20:24:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3C9EE21C2EF for ; Tue, 19 Jul 2011 20:24:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C70601BC0DB for ; Tue, 19 Jul 2011 20:24:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 276968003D for ; Tue, 19 Jul 2011 20:24:33 +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: <252e2e1dd5b4ffe70bb1700c3f94da05fc30d2e3.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: 252e2e1dd5b4ffe70bb1700c3f94da05fc30d2e3 Date: Tue, 19 Jul 2011 20:24:33 +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: 7763f31c95d812ee95a1b0d87c5f23ac commit: 252e2e1dd5b4ffe70bb1700c3f94da05fc30d2e3 Author: Zac Medico gentoo org> AuthorDate: Tue Jul 19 20:23:35 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 19 20:23:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D252e2e1d Scheduler: fix _running_tasks for uninstalls --- pym/_emerge/Scheduler.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 1b3a034..d13e622 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1661,10 +1661,10 @@ class Scheduler(PollScheduler): self._pkg_count.curval +=3D 1 =20 task =3D self._task(pkg) - self._running_tasks[id(task)] =3D task =20 if pkg.installed: merge =3D PackageMerge(merge=3Dtask) + self._running_tasks[id(merge)] =3D merge merge.addExitListener(self._merge_exit) self._task_queues.merge.addFront(merge) =20 @@ -1672,6 +1672,7 @@ class Scheduler(PollScheduler): self._jobs +=3D 1 self._previous_job_start_time =3D time.time() self._status_display.running =3D self._jobs + self._running_tasks[id(task)] =3D task task.addExitListener(self._extract_exit) self._task_queues.jobs.add(task) =20 @@ -1679,6 +1680,7 @@ class Scheduler(PollScheduler): self._jobs +=3D 1 self._previous_job_start_time =3D time.time() self._status_display.running =3D self._jobs + self._running_tasks[id(task)] =3D task task.addExitListener(self._build_exit) self._task_queues.jobs.add(task) =20