From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 14 Apr 2023 20:48:41 +0000 (+0200)
Subject: Use absolute paths everywhere
X-Git-Tag: v15~253^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1438%2Fhead;p=thirdparty%2Fmkosi.git

Use absolute paths everywhere

bwrap seems to run into permission errors with relative paths in
some cases so let's follow systemd best practices and convert all
config paths to absolute paths as we're parsing them.

Fixes #1430
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 036c21088..92e3ffc3f 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1130,6 +1130,7 @@ def load_args(args: argparse.Namespace) -> MkosiConfig:
             args.output = args.output_dir / args.output
         else:
             warn("Ignoring configured output directory as output file is a qualified path.")
+            args.output = args.output.absolute()
 
     if args.environment:
         env = {}
diff --git a/mkosi/config.py b/mkosi/config.py
index bb36af8ec..ecf6032f4 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -45,9 +45,9 @@ def parse_source_target_paths(value: str) -> tuple[Path, Optional[Path]]:
     src, _, target = value.partition(':')
     if not Path(src).exists():
         die(f"{src} does not exist")
-    if target and not Path(target).absolute():
+    if target and not Path(target).is_absolute():
         die("Target path must be absolute")
-    return Path(src), Path(target) if target else None
+    return Path(src).absolute(), Path(target) if target else None
 
 
 def config_parse_string(dest: str, value: Optional[str], namespace: argparse.Namespace) -> Optional[str]:
@@ -71,7 +71,7 @@ def config_parse_script(dest: str, value: Optional[str], namespace: argparse.Nam
         if not os.access(value, os.X_OK):
             die(f"{value} is not executable")
 
-    return Path(value) if value else None
+    return Path(value).absolute() if value else None
 
 
 def config_parse_boolean(dest: str, value: Optional[str], namespace: argparse.Namespace) -> bool:
@@ -196,7 +196,7 @@ def make_path_parser(required: bool) -> Callable[[str], Path]:
         if required and not Path(value).exists():
             die(f"{value} does not exist")
 
-        return Path(value)
+        return Path(value).absolute()
 
     return parse_path
 
@@ -209,7 +209,7 @@ def config_make_path_parser(required: bool) -> ConfigParseCallback:
         if value and required and not Path(value).exists():
             die(f"{value} does not exist")
 
-        return Path(value) if value else None
+        return Path(value).absolute() if value else None
 
     return config_parse_path