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 570B3138334 for ; Wed, 6 Jun 2018 04:33:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33636E09F9; Wed, 6 Jun 2018 04:33:03 +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 04E72E09F9 for ; Wed, 6 Jun 2018 04:33:01 +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 77795335C84 for ; Wed, 6 Jun 2018 04:33:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C15892AA for ; Wed, 6 Jun 2018 04:32:58 +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: <1528259200.1fc628eead43fa5da4b142479aa004ded8acceab.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: 1fc628eead43fa5da4b142479aa004ded8acceab X-VCS-Branch: master Date: Wed, 6 Jun 2018 04:32:58 +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: 489d4463-1866-47ab-a551-16850903dd09 X-Archives-Hash: cc5b1848a3745854855692ca4c0820ec commit: 1fc628eead43fa5da4b142479aa004ded8acceab Author: Zac Medico gentoo org> AuthorDate: Wed Jun 6 04:26:40 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 6 04:26:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1fc628ee AbstractEbuildProcess: handle SIGINT during dir lock (bug 657436) When the build dir lock is interrupted by SIGINT/TERM, avoid raising an unwanted CancelledError. Bug: https://bugs.gentoo.org/657436 pym/_emerge/AbstractEbuildProcess.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index af6429a00..bda0bd83f 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -171,6 +171,13 @@ class AbstractEbuildProcess(SpawnProcess): if lock_future is not self._start_future: raise AssertionError('lock_future is not self._start_future') self._start_future = None + if lock_future.cancelled(): + self._build_dir = None + self.cancelled = True + self._was_cancelled() + self._async_wait() + return + lock_future.result() if start_ipc_daemon: