From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 9 Nov 2023 13:26:35 +0000 (+0100)
Subject: Make default workspace directory logic more robust
X-Git-Tag: v19~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a249c20d743907e1cfbc90fff380faed4d27a57;p=thirdparty%2Fmkosi.git

Make default workspace directory logic more robust

When running with sudo, $HOME won't be set, so let's rework the
logic to not rely on that.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 168b5aa59..487a52749 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -893,17 +893,18 @@ class MkosiConfig:
         if (cache := os.getenv("XDG_CACHE_HOME")) and Path(cache).exists():
             return Path(cache)
 
-        # If there's a cache directory and we're running from /home, we want to use a workspace directory in /home as
-        # well as /home might be on a separate partition or subvolume which means that to take advantage of reflinks
-        # and such, the workspace directory has to be on the same partition/subvolume.
-        if (
-            (home := os.getenv("HOME")) and
-            "/home" in home and
-            self.cache_dir and
-            self.cache_dir.is_relative_to(home) and
-            (Path(home) / ".cache").exists()
-        ):
-            return Path(home) / ".cache"
+        # If we're running from /home and there's a cache or output directory in /home, we want to use a workspace
+        # directory in /home as well as /home might be on a separate partition or subvolume which means that to take
+        # advantage of reflinks and such, the workspace directory has to be on the same partition/subvolume.
+        if Path.cwd().is_relative_to("/home") and len(Path.cwd().parents) >= 3:
+            home = Path.cwd().parents[-3]
+
+            if (
+                (self.cache_dir and self.cache_dir.is_relative_to(home) or
+                self.output_dir and self.output_dir.is_relative_to(home)) and
+                (home / ".cache").exists()
+            ):
+                return home / ".cache"
 
         return Path("/var/tmp")