From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 20 May 2022 11:32:20 +0000 (+0200)
Subject: machine: Hide subprocess stacktrace when a command fails during build
X-Git-Tag: v13~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F985%2Fhead;p=thirdparty%2Fmkosi.git

machine: Hide subprocess stacktrace when a command fails during build

Similar to #983 but when building the image instead of booting it.
---

diff --git a/mkosi/machine.py b/mkosi/machine.py
index 5b588d799..6a6a810e5 100644
--- a/mkosi/machine.py
+++ b/mkosi/machine.py
@@ -205,7 +205,10 @@ class MkosiMachineTest(unittest.TestCase):
         if no_qemu and verb == Verb.qemu:
             raise unittest.SkipTest("Qemu test skipped due to environment variable.")
 
-        cls.machine.build()
+        try:
+            cls.machine.build()
+        except subprocess.CalledProcessError as e:
+            raise cls.failureException(f'Failed to build image because "{e.cmd}" failed with exit status {e.returncode}') from None
 
     def setUp(self) -> None:
         # Replacing underscores which makes name invalid.