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 1Q3ZEQ-0008FX-8c for garchives@archives.gentoo.org; Sat, 26 Mar 2011 19:33:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D4FA1C090; Sat, 26 Mar 2011 19:31:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C36131C062 for ; Sat, 26 Mar 2011 19:31:02 +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 483171B4123 for ; Sat, 26 Mar 2011 19:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A94C58006A for ; Sat, 26 Mar 2011 19:31:01 +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: <5d26b19d2654adbb431103db864e6c9364b5a641.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/TaskSequence.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5d26b19d2654adbb431103db864e6c9364b5a641 Date: Sat, 26 Mar 2011 19:31:01 +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: 9273af6e7d46107b526f5895f9c35bf7 commit: 5d26b19d2654adbb431103db864e6c9364b5a641 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 18 23:45:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 19:19:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5d26b19d TaskSequence: also call CompositeTask._cancel() This is a regression from commit 363a7478a100495d2e8597bc6c6d2fdac94339e0 but it's usually not noticeable with Ctrl-C since SIGINT is propagated to nested processes. --- pym/_emerge/TaskSequence.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/TaskSequence.py b/pym/_emerge/TaskSequence.py index 5d6b73f..1fecf63 100644 --- a/pym/_emerge/TaskSequence.py +++ b/pym/_emerge/TaskSequence.py @@ -27,6 +27,7 @@ class TaskSequence(CompositeTask): =20 def _cancel(self): self._task_queue.clear() + CompositeTask._cancel(self) =20 def _start_next_task(self): self._start_task(self._task_queue.popleft(),