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-347977-garchives=archives.gentoo.org@lists.gentoo.org>) id 1QPipv-0003Lg-4S for garchives@archives.gentoo.org; Thu, 26 May 2011 22:15:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E6E21C025; Thu, 26 May 2011 22:15:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 58A091C025 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 22:15:15 +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 B37FD1B4008 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 22:15:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 297F080505 for <gentoo-commits@lists.gentoo.org>; Thu, 26 May 2011 22:15:14 +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: <e0c79d23399998114284e9f6245e812b8df57474.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master 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: e0c79d23399998114284e9f6245e812b8df57474 Date: Thu, 26 May 2011 22:15:14 +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: f1a345600e4abb163555e2cab34792f6 commit: e0c79d23399998114284e9f6245e812b8df57474 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu May 26 22:14:07 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 26 22:14:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De0c79d23 AsynchronousLock: check type in _poll and _cancel --- pym/_emerge/AsynchronousLock.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index d117979..debf153 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -70,12 +70,12 @@ class AsynchronousLock(AsynchronousTask): self.wait() =20 def _cancel(self): - if self._imp is not None: + if isinstance(self._imp, AsynchronousTask): self._imp.cancel() =20 def _poll(self): - if self._imp is not None: - return self._imp.poll() + if isinstance(self._imp, AsynchronousTask): + self._imp.poll() return self.returncode =20 def _wait(self):