From 879ed3b6d6843701a4979be92248d6fdeb28f4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Wed, 21 Apr 2021 12:46:44 +0000 Subject: [PATCH] Run "kill" from shell, handle failure to execute. --- coredump_uploader/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coredump_uploader/__init__.py b/coredump_uploader/__init__.py index c4648f8..e547f86 100644 --- a/coredump_uploader/__init__.py +++ b/coredump_uploader/__init__.py @@ -337,11 +337,12 @@ def signal_name_to_signal_number(signal_name): temp = str( "-l" + re.match(r"SIG(?P.*)", signal_name).group("exit_signal") ) - exit_signal_number = subprocess.check_output(["kill", temp]) - except AttributeError: - exit_signal_number = None + # kill can be a shell builtin, or not even present... + exit_signal_number = subprocess.check_output(["kill", temp], shell=True) + except (AttributeError, subprocess.CalledProcessError): + return None - return exit_signal_number + return int(exit_signal_number) class CoredumpHandler(RegexMatchingEventHandler): @@ -572,7 +573,7 @@ class CoredumpUploader(object): "synthetic": True, "meta": { "signal": { - "number": int(exit_signal_number), + "number": exit_signal_number, "code": None, "name": exit_signal, },