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 1QLs7m-0001bm-Ll for garchives@archives.gentoo.org; Mon, 16 May 2011 07:21:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70AC21C128; Mon, 16 May 2011 07:21:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 43ACD1C128 for ; Mon, 16 May 2011 07:21:47 +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 D462A1B4031 for ; Mon, 16 May 2011 07:21:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 258BA7448A for ; Mon, 16 May 2011 07:21:46 +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:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/BinpkgFetcher.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e26008ef6eea54c04d3fe62a0e657e4a4581025a Date: Mon, 16 May 2011 07:21:46 +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: ed604a2042580a87884fe624d7630916 commit: e26008ef6eea54c04d3fe62a0e657e4a4581025a Author: Zac Medico gentoo org> AuthorDate: Mon May 16 07:21:03 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 16 07:21:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De26008ef BinpkgFetcher: handle AsynchronousLock failure --- pym/_emerge/BinpkgFetcher.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 221d9a7..12544d1 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -158,7 +158,12 @@ class BinpkgFetcher(SpawnProcess): async_lock =3D AsynchronousLock(path=3Dself.pkg_path, scheduler=3Dself.scheduler) async_lock.start() - async_lock.wait() + + if async_lock.wait() !=3D os.EX_OK: + # TODO: Use CompositeTask for better handling, like in EbuildPhase. + raise AssertionError("AsynchronousLock failed with returncode %s" \ + % (async_lock.returncode,)) + self._lock_obj =3D async_lock self.locked =3D True =20