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 299CE1382C5 for ; Sun, 29 Apr 2018 00:49:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28524E0824; Sun, 29 Apr 2018 00:49:40 +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 06954E0824 for ; Sun, 29 Apr 2018 00:49:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 92A92335CA2 for ; Sun, 29 Apr 2018 00:49:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCBC0287 for ; Sun, 29 Apr 2018 00:49:35 +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: <1524962921.3e235049eb36dd983b695ed50aca4e32d7d28950.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AbstractEbuildProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3e235049eb36dd983b695ed50aca4e32d7d28950 X-VCS-Branch: master Date: Sun, 29 Apr 2018 00:49:35 +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: 8f437e05-a3a9-459b-91d3-698cf4a5a4a7 X-Archives-Hash: bb14596213bdfe959f80bb7c54601201 commit: 3e235049eb36dd983b695ed50aca4e32d7d28950 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 29 00:48:41 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 29 00:48:41 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e235049 AbstractEbuildProcess: use _async_waitpid after kill (bug 403697) Use _async_waitpid() instead of _async_wait() in the _cancel_timeout_cb method, since the pid exit status may not be available yet. Bug: https://bugs.gentoo.org/403697 pym/_emerge/AbstractEbuildProcess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index d481e6046..1012ce166 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -266,7 +266,7 @@ class AbstractEbuildProcess(SpawnProcess): def _cancel_timeout_cb(self): self._exit_timeout_id = None - self._async_wait() + self._async_waitpid() return False # only run once def _orphan_process_warn(self):