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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8DB9C15808D for ; Tue, 19 Apr 2022 21:12:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2136E087E; Tue, 19 Apr 2022 21:12:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 562A5E087E for ; Tue, 19 Apr 2022 21:12:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53F60341AB9 for ; Tue, 19 Apr 2022 21:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 941D8287 for ; Tue, 19 Apr 2022 21:12:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1650402564.9f4d46a13ed4b223866c50e109f5c51488fc6bd9.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/ X-VCS-Repository: repo/gentoo X-VCS-Files: scripts/bootstrap.sh X-VCS-Directories: scripts/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9f4d46a13ed4b223866c50e109f5c51488fc6bd9 X-VCS-Branch: master Date: Tue, 19 Apr 2022 21:12:20 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1124085d-9a75-402e-a558-5a3de9d1a41d X-Archives-Hash: 3966b829c8588ce9ff0906e9d3ddd857 commit: 9f4d46a13ed4b223866c50e109f5c51488fc6bd9 Author: Mike Gilbert gentoo org> AuthorDate: Tue Apr 19 21:09:24 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Apr 19 21:09:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4d46a1 scripts/bootstrap.sh: do not attempt to trap SIGKILL Closes: https://bugs.gentoo.org/839162 Signed-off-by: Mike Gilbert gentoo.org> scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a84263ba448e..0c0d6062a789 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -172,7 +172,7 @@ pycmd() { } # TSTP messes ^Z of bootstrap up, so we don't trap it anymore. -trap "cleanup" TERM KILL INT QUIT ABRT +trap "cleanup" TERM INT QUIT ABRT # Bug #50158 (don't use `which` in a bootstrap). if ! type -path portageq &>/dev/null ; then