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 1Q04By-0007Bh-AU for garchives@archives.gentoo.org; Thu, 17 Mar 2011 03:48:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB886E05A5; Thu, 17 Mar 2011 03:47:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8581DE05A5 for ; Thu, 17 Mar 2011 03:47:58 +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 054D71B4007 for ; Thu, 17 Mar 2011 03:47:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3D80A8006A for ; Thu, 17 Mar 2011 03:47:57 +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: <9fa6881ac70e799e09fe98c1eb24177663f3b0e5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Binpkg.py pym/_emerge/CompositeTask.py pym/_emerge/EbuildExecuter.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9fa6881ac70e799e09fe98c1eb24177663f3b0e5 Date: Thu, 17 Mar 2011 03:47:57 +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: 1b63cd803d6dbbc8c4111bc8b9bb34fd commit: 9fa6881ac70e799e09fe98c1eb24177663f3b0e5 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 17 03:44:55 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 17 03:44:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9fa6881a CompositeTask: handle unstarted terminated tasks --- pym/_emerge/Binpkg.py | 4 ++-- pym/_emerge/CompositeTask.py | 22 ++++++++++++++++++++-- pym/_emerge/EbuildExecuter.py | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 65a5ef4..b011b00 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from _emerge.EbuildPhase import EbuildPhase @@ -277,7 +277,7 @@ class Binpkg(CompositeTask): settings=3Dsettings) =20 setup_phase.addExitListener(self._setup_exit) - self._current_task =3D setup_phase + self._task_queued(setup_phase) self.scheduler.scheduleSetup(setup_phase) =20 def _setup_exit(self, setup_phase): diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index b5e8ce5..8e8f084 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -8,13 +8,19 @@ class CompositeTask(AsynchronousTask): =20 __slots__ =3D ("scheduler",) + ("_current_task",) =20 + _TASK_QUEUED =3D -1 + def isAlive(self): return self._current_task is not None =20 def cancel(self): self.cancelled =3D True if self._current_task is not None: - self._current_task.cancel() + if self._current_task is self._TASK_QUEUED: + self.returncode =3D 1 + self._current_task =3D None + else: + self._current_task.cancel() AsynchronousTask.cancel(self) =20 def _poll(self): @@ -32,7 +38,9 @@ class CompositeTask(AsynchronousTask): prev =3D None while True: task =3D self._current_task - if task is None or task is prev: + if task is None or \ + task is self._TASK_QUEUED or \ + task is prev: # don't poll the same task more than once break task.poll() @@ -48,6 +56,10 @@ class CompositeTask(AsynchronousTask): if task is None: # don't wait for the same task more than once break + if task is self._TASK_QUEUED: + self.returncode =3D 1 + self._current_task =3D None + break if task is prev: if self.returncode is not None: # This is expected if we're being @@ -123,3 +135,9 @@ class CompositeTask(AsynchronousTask): self._current_task =3D task task.start() =20 + def _task_queued(self, task): + task.addStartListener(self._task_queued_start_handler) + self._current_task =3D self._TASK_QUEUED + + def _task_queued_start_handler(self, task): + self._current_task =3D task diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.p= y index b28c737..f8febd4 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -51,7 +51,7 @@ class EbuildExecuter(CompositeTask): settings=3Dsettings) =20 setup_phase.addExitListener(self._setup_exit) - self._current_task =3D setup_phase + self._task_queued(setup_phase) self.scheduler.scheduleSetup(setup_phase) =20 def _setup_exit(self, setup_phase): @@ -69,7 +69,7 @@ class EbuildExecuter(CompositeTask): # otherwise they can interfere with eachother. =20 unpack_phase.addExitListener(self._unpack_exit) - self._current_task =3D unpack_phase + self._task_queued(unpack_phase) self.scheduler.scheduleUnpack(unpack_phase) =20 else: