From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 6 Aug 2023 22:08:42 +0000 (+0200)
Subject: Default workspace directory to the current working directory
X-Git-Tag: v15~25^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1747%2Fhead;p=thirdparty%2Fmkosi.git

Default workspace directory to the current working directory

This was already the implicit assumption, let's make it explicit.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 5ff1d8079..423665780 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -626,8 +626,8 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
                 *(["--compress-output", str(state.config.compress_output)] if state.config.compress_output else []),
                 "--with-network", str(state.config.with_network),
                 "--cache-only", str(state.config.cache_only),
-                *(["--output-dir", str(state.config.output_dir)] if state.config.output_dir else []),
-                *(["--workspace-dir", str(state.config.workspace_dir)] if state.config.workspace_dir else []),
+                "--output-dir", str(state.config.output_dir),
+                "--workspace-dir", str(state.config.workspace_dir),
                 "--cache-dir", str(state.cache_dir.parent),
                 *(["--local-mirror", str(state.config.local_mirror)] if state.config.local_mirror else []),
                 "--incremental", str(state.config.incremental),
@@ -1348,7 +1348,7 @@ def finalize_staging(state: MkosiState) -> None:
 
 def build_image(args: MkosiArgs, config: MkosiConfig) -> None:
     manifest = Manifest(config)
-    workspace = tempfile.TemporaryDirectory(dir=config.workspace_dir or Path.cwd(), prefix=".mkosi-tmp")
+    workspace = tempfile.TemporaryDirectory(dir=config.workspace_dir, prefix=".mkosi-tmp")
 
     # Make sure tmpfiles' aging doesn't interfere with our workspace
     # while we are working on it.
diff --git a/mkosi/config.py b/mkosi/config.py
index 344570473..57b9cdd0f 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -682,7 +682,7 @@ class MkosiConfig:
     ephemeral: bool
     ssh: bool
     credentials: dict[str, str]
-    workspace_dir: Optional[Path]
+    workspace_dir: Path
     initrds: list[Path]
     make_initrd: bool
     kernel_modules_include: list[str]
@@ -903,7 +903,7 @@ class MkosiConfigParser:
             section="Output",
             parse=config_make_path_parser(required=False),
             paths=("mkosi.output",),
-            default=Path("."),
+            default=Path.cwd(),
             help="Output directory",
         ),
         MkosiConfigSetting(
@@ -913,6 +913,7 @@ class MkosiConfigParser:
             section="Output",
             parse=config_make_path_parser(required=False),
             paths=("mkosi.workspace",),
+            default=Path.cwd(),
             help="Workspace directory",
         ),
         MkosiConfigSetting(