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 <gentoo-commits+bounces-326632-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Q0gzM-0004S5-Oz for garchives@archives.gentoo.org; Fri, 18 Mar 2011 21:13:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26031E05D9; Fri, 18 Mar 2011 21:12:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ED1D9E05D9 for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 21:12:28 +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 ACB961B40DE for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 21:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1C96180073 for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 21:12:28 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <f72d4b20478a33da08dd30f399b3a55cc7a9dda4.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AsynchronousLock.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f72d4b20478a33da08dd30f399b3a55cc7a9dda4 Date: Fri, 18 Mar 2011 21:12:28 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5e1e62961170fc560b1a93c3f15d7e68 commit: f72d4b20478a33da08dd30f399b3a55cc7a9dda4 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Mar 17 20:08:35 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Mar 18 19:50:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df72d4b20 AsynchronousLock: implement _cancel --- pym/_emerge/AsynchronousLock.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index 6e0a1ac..6fa2bf6 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -66,6 +66,10 @@ class AsynchronousLock(AsynchronousTask): if not self._waiting: self.wait() =20 + def _cancel(self): + if self._imp is not None: + self._imp.cancel() + def _wait(self): if self.returncode is not None: return self.returncode @@ -127,6 +131,10 @@ class _LockThread(AbstractPollTask): self.returncode =3D os.EX_OK self.wait() =20 + def _cancel(self): + # There's currently no way to force thread termination. + pass + def _wait(self): if self.returncode is not None: return self.returncode