From 9f805a4ebe7b08d0816f9b9fdb169c1b185d27c4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 23 Aug 2017 11:32:35 +1000 Subject: [PATCH] tools: don't return a ratbagd_process if things failed If we couldn't find the name on the bus or the ratbagd process already terminated, return None and fail. Signed-off-by: Peter Hutterer --- tools/ratbagctl.devel.in | 2 ++ tools/toolbox.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tools/ratbagctl.devel.in b/tools/ratbagctl.devel.in index b29bd7c7..4a08a137 100755 --- a/tools/ratbagctl.devel.in +++ b/tools/ratbagctl.devel.in @@ -39,6 +39,8 @@ def main(argv): argv = ["list"] ratbagd_process = toolbox.start_ratbagd() + if ratbagd_process is None: + sys.exit("Failed to start or connect to ratbagd") ratbagd = toolbox.open_ratbagd() parser = toolbox.get_parser() diff --git a/tools/toolbox.py b/tools/toolbox.py index 57c3f088..cd826e36 100644 --- a/tools/toolbox.py +++ b/tools/toolbox.py @@ -84,6 +84,9 @@ def start_ratbagd(): os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1_@ratbagd_sha@" + if name_owner is None or ratbagd_process.poll() is not None: + return None + return ratbagd_process