From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Fri, 28 Oct 2022 09:00:42 +0000 (+0200)
Subject: Make load_args sideeffect free
X-Git-Tag: v15~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60289499675661169cd7bfda2faf331663a43c73;p=thirdparty%2Fmkosi.git

Make load_args sideeffect free

It is unnecessary for the find_foo functions in load_args to generate and chown
directories, since for output and build directory this is already done by the
make_foo_dir functions in build_stuff. At a similar function for the cache
directory.

Having the find_foo functions make the directories has the downside of leading
to permission errors, when the tests are run with fakeroot as done by many
distro buildsystems.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index eb0397bf1..adf4eabd1 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -6256,8 +6256,6 @@ def find_output(args: argparse.Namespace) -> None:
     else:
         return
 
-    mkdirp_chown_current_user(args.output_dir, skip_chown=args.no_chown)
-
 
 def find_builddir(args: argparse.Namespace) -> None:
     subdir = f"{args.distribution}~{args.release}"
@@ -6269,8 +6267,6 @@ def find_builddir(args: argparse.Namespace) -> None:
     else:
         return
 
-    mkdirp_chown_current_user(args.build_dir, skip_chown=args.no_chown)
-
 
 def find_cache(args: argparse.Namespace) -> None:
     subdir = f"{args.distribution}~{args.release}"
@@ -6282,8 +6278,6 @@ def find_cache(args: argparse.Namespace) -> None:
     else:
         return
 
-    mkdirp_chown_current_user(args.cache_path, skip_chown=args.no_chown)
-
 
 def require_private_file(name: str, description: str) -> None:
     mode = os.stat(name).st_mode & 0o777
@@ -7064,6 +7058,15 @@ def make_build_dir(config: MkosiConfig) -> None:
     mkdirp_chown_current_user(config.build_dir, skip_chown=config.no_chown, mode=0o755)
 
 
+def make_cache_dir(config: MkosiConfig) -> None:
+    """Create the output directory if set and not existing yet"""
+    # TODO: mypy complains that having the same structure as above, makes  the
+    # return on None unreachable code. I can't see right now, why it *should* be
+    # unreachable, so invert the structure here to be on the safe side.
+    if config.cache_path is not None:
+        mkdirp_chown_current_user(config.cache_path, skip_chown=config.no_chown, mode=0o755)
+
+
 def configure_ssh(state: MkosiState, cached: bool) -> Optional[TextIO]:
     if state.do_run_build_script or not state.config.ssh:
         return None
@@ -7500,6 +7503,7 @@ def remove_artifacts(
 
 def build_stuff(config: MkosiConfig) -> Manifest:
     make_output_dir(config)
+    make_cache_dir(config)
     workspace = setup_workspace(config)
     cache = setup_package_cache(config, Path(workspace.name))