Don't log stacktraces for non-zero exits from ssh, qemu or systemd-nspawn

diff --git a/mkosi/__main__.py b/mkosi/__main__.py
index db091f63afb8be5b92ad92224f351ef773b4b881..deb1ebf71d2a3127862fece98e9b70481914a66e 100644 (file)
--- a/mkosi/__main__.py
+++ b/mkosi/__main__.py
@@ -30,7 +30,8 @@ def propagate_failed_return() -> Iterator[None]:
 
         sys.exit(1)
     except subprocess.CalledProcessError as e:
-        if ARG_DEBUG.get():
+        # Failures from qemu, ssh and systemd-nspawn are expected and we won't log stacktraces for those.
+        if ARG_DEBUG.get() and e.cmd and e.cmd[0] not in ("qemu", "ssh", "systemd-nspawn"):
             sys.excepthook(*ensure_exc_info())
 
         # We always log when subprocess.CalledProcessError is raised, so we don't log again here.