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 B218A138334 for ; Thu, 2 Jan 2020 17:33:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD668E09AD; Thu, 2 Jan 2020 17:33:38 +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 C5714E09AD for ; Thu, 2 Jan 2020 17:33: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 4621434DE6C for ; Thu, 2 Jan 2020 17:33:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C2A637 for ; Thu, 2 Jan 2020 17:33:35 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1577986383.d00387e421e541bad7e3c16e2a7c67bc3c0a1cb7.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_funcs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: d00387e421e541bad7e3c16e2a7c67bc3c0a1cb7 X-VCS-Branch: master Date: Thu, 2 Jan 2020 17:33: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 45f3fc2b-b21c-4310-a64a-34d8e7b7e487 X-Archives-Hash: 6691c9b11f20087454bd6a4258e1fb05 commit: d00387e421e541bad7e3c16e2a7c67bc3c0a1cb7 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jan 2 17:33:03 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Jan 2 17:33:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d00387e4 gen_funcs.sh: gen_die(): Prevent recursion Closes: https://bugs.gentoo.org/704546 Signed-off-by: Thomas Deutschmann gentoo.org> gen_funcs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gen_funcs.sh b/gen_funcs.sh index 87e4b3a..1f574ad 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -407,6 +407,14 @@ gen_die() { # We died in a subshell! Let's trigger trap function... kill -s SIGTERM ${GK_MASTER_PID} else + if [ -z "${GK_DIED_IN}" ] + then + GK_DIED_IN="$(get_useful_function_stack)" + else + # We are already dying + exit 1 + fi + # Don't trust $LOGFILE before determine_real_args() was called if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ] then