From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 19 Oct 2023 10:26:34 +0000 (+0200)
Subject: Don't assume FileNotFoundError from run() is about the executable
X-Git-Tag: v19~63^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=736cdf8bf2a1d5b660c39fdc3da7cf7befc1cdaa;p=thirdparty%2Fmkosi.git

Don't assume FileNotFoundError from run() is about the executable

It could also be about e.g. the working directory, so let's make sure
we log about it correctly.
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 6eccccf75..16f51f00d 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -215,8 +215,8 @@ def run(
             cwd=cwd,
             preexec_fn=make_foreground_process,
         )
-    except FileNotFoundError:
-        die(f"{cmdline[0]} not found in PATH.")
+    except FileNotFoundError as e:
+        die(f"{e.filename} not found.")
     except subprocess.CalledProcessError as e:
         if log:
             logging.error(f"\"{shlex.join(cmdline)}\" returned non-zero exit code {e.returncode}.")
@@ -263,8 +263,8 @@ def spawn(
             preexec_fn=make_foreground_process if foreground else None,
         ) as proc:
             yield proc
-    except FileNotFoundError:
-        die(f"{cmdline[0]} not found in PATH.")
+    except FileNotFoundError as e:
+        die(f"{e.filename} not found.")
     except subprocess.CalledProcessError as e:
         if log:
             logging.error(f"\"{shlex.join(cmdline)}\" returned non-zero exit code {e.returncode}.")