_signals.py: Guard against use in non-main thread

1 files changed, 6 insertions, 0 deletions

diff --git a/buildstream/_signals.py b/buildstream/_signals.py
index 9749e0d1a..06849c9f9 100644
--- a/buildstream/_signals.py
+++ b/buildstream/_signals.py
@@ -20,6 +20,7 @@
 import os
 import signal
 import sys
+import threading
 import traceback
 from contextlib import contextmanager, ExitStack
 from collections import deque
@@ -72,6 +73,11 @@ def terminator_handler(signal_, frame):
 def terminator(terminate_func):
     global terminator_stack                   # pylint: disable=global-statement
 
+    # Signal handling only works in the main thread
+    if threading.current_thread() != threading.main_thread():
+        yield
+        return
+
     outermost = False if terminator_stack else True
 
     terminator_stack.append(terminate_func)