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 1Q02FL-0001Ys-80 for garchives@archives.gentoo.org; Thu, 17 Mar 2011 01:43:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C8C1C001; Thu, 17 Mar 2011 01:43:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 78D7A1C001 for ; Thu, 17 Mar 2011 01:43:19 +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 10BC31B4060 for ; Thu, 17 Mar 2011 01:43:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 704A78006A for ; Thu, 17 Mar 2011 01:43:18 +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: <947f4bdcd0303a0170d9e1bac3d0964f747ce36b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/CompositeTask.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 947f4bdcd0303a0170d9e1bac3d0964f747ce36b Date: Thu, 17 Mar 2011 01:43:18 +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: 25b37962aca5f14854314924f231263b commit: 947f4bdcd0303a0170d9e1bac3d0964f747ce36b Author: Zac Medico gentoo org> AuthorDate: Thu Mar 17 01:42:59 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 17 01:42:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D947f4bdc CompositeTask: fix assertion in _wait --- pym/_emerge/CompositeTask.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index 4667b78..b5e8ce5 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -49,6 +49,11 @@ class CompositeTask(AsynchronousTask): # don't wait for the same task more than once break if task is prev: + if self.returncode is not None: + # This is expected if we're being + # called from the task's exit listener + # after it's been cancelled. + break # Before the task.wait() method returned, an exit # listener should have set self._current_task to either # a different task or None. Something is wrong.