run: Wait for child process in try block in spawn()

If we only wait in finally block then any keyboard interrupt
triggered during the wait will leave the child process alive and
won't wait for it to exit. Let's make sure this doesn't happen by
waiting in the try block as well.

diff --git a/mkosi/run.py b/mkosi/run.py
index 928634e36ed6477710cca610a78e6814db766a33..57b3ef468fc2f80a66b9f6d86f24533fbd829c41 100644 (file)
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -227,6 +227,7 @@ def spawn(
 
         try:
             yield proc
+            proc.wait()
         except KeyboardInterrupt:
             proc.send_signal(signal.SIGINT)
             raise