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 1QPj8c-0005BO-DQ for garchives@archives.gentoo.org; Thu, 26 May 2011 22:34:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D24AC1C01F; Thu, 26 May 2011 22:34:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A588A1C01F for ; Thu, 26 May 2011 22:34:34 +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 37FB31B4008 for ; Thu, 26 May 2011 22:34:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A2F7C80505 for ; Thu, 26 May 2011 22:34:33 +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: 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: b37b5d5cf4a87fee0d9afdd90c775c82ef92d6c1 Date: Thu, 26 May 2011 22:34:33 +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: e12b51d71ab813b29669efe82beb3c82 commit: b37b5d5cf4a87fee0d9afdd90c775c82ef92d6c1 Author: Zac Medico gentoo org> AuthorDate: Thu May 26 22:14:07 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 26 22:15:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db37b5d5c 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):