From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2752D1382C5 for ; Thu, 26 Apr 2018 07:12:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F1ABE084A; Thu, 26 Apr 2018 07:12:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D44FE084A for ; Thu, 26 Apr 2018 07:12:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1001E335C72 for ; Thu, 26 Apr 2018 07:12:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C515C261 for ; Thu, 26 Apr 2018 07:12:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1524726534.94a37752ab21883065ed7150b902dfda2b45a5b3.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: 94a37752ab21883065ed7150b902dfda2b45a5b3 X-VCS-Branch: master Date: Thu, 26 Apr 2018 07:12:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7392b78d-2a4a-4671-875c-efad6ca54737 X-Archives-Hash: 9cff045ba14a5e375814d8eeee6d4da9 commit: 94a37752ab21883065ed7150b902dfda2b45a5b3 Author: Zac Medico gentoo org> AuthorDate: Thu Apr 26 07:00:18 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 26 07:08:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=94a37752 AsynchronousLock: use _async_wait() (bug 591760) Use _async_wait() to avoid event loop recursion. Bug: https://bugs.gentoo.org/591760 pym/_emerge/AsynchronousLock.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 0178feab2..820d047b2 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -1,4 +1,4 @@ -# Copyright 2010-2013 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import fcntl @@ -70,7 +70,8 @@ class AsynchronousLock(AsynchronousTask): def _imp_exit(self, imp): # call exit listeners - self.wait() + self.returncode = imp.returncode + self._async_wait() def _cancel(self): if isinstance(self._imp, AsynchronousTask): @@ -251,7 +252,7 @@ class _LockProcess(AbstractPollTask): level=logging.ERROR, noiselevel=-1) self._unregister() self.returncode = proc.returncode - self.wait() + self._async_wait() return if not self.cancelled and \