From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A6D7C138010 for ; Fri, 19 Oct 2012 01:28:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E44321C047; Fri, 19 Oct 2012 01:28:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1925221C047 for ; Fri, 19 Oct 2012 01:28:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E8A733D9D4 for ; Fri, 19 Oct 2012 01:28:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 23DEAE5436 for ; Fri, 19 Oct 2012 01:28:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1350610079.2d2cb6ee98324b478a5671df2178f91104bcbd12.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PipeReader.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2d2cb6ee98324b478a5671df2178f91104bcbd12 X-VCS-Branch: master Date: Fri, 19 Oct 2012 01:28:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ebc8377-f2ca-4c4f-8950-bb542fd7f3d1 X-Archives-Hash: 02439ec49b5ae2ca9566f87f5602a071 commit: 2d2cb6ee98324b478a5671df2178f91104bcbd12 Author: Zac Medico gentoo org> AuthorDate: Fri Oct 19 01:27:59 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 19 01:27:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2d2cb6ee PipeReader: unregister in _cancel --- pym/_emerge/PipeReader.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index fcdefb4..7209e9e 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -34,8 +34,9 @@ class PipeReader(AbstractPollTask): self._registered = True def _cancel(self): + self._unregister() if self.returncode is None: - self.returncode = 1 + self.returncode = self._cancelled_returncode def _wait(self): if self.returncode is not None: