From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 30 Jan 2025 12:38:03 +0000 (+0100)
Subject: Use directory in user's home as output directory if possible
X-Git-Tag: v25.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f3447cad36e477863140a78d2b2d017ca43e25;p=thirdparty%2Fmkosi.git

Use directory in user's home as output directory if possible

Otherwise, if the user's home is on a separate partition, we have to
do a very expensive copy to /var/tmp.
---

diff --git a/tests/__init__.py b/tests/__init__.py
index eb3a5ad1d..6aa7596ae 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -17,6 +17,7 @@ from mkosi.distributions import Distribution
 from mkosi.run import CompletedProcess, fork_and_wait, run
 from mkosi.sandbox import acquire_privileges
 from mkosi.tree import rmtree
+from mkosi.user import INVOKING_USER
 from mkosi.util import _FILE, PathString
 
 
@@ -33,7 +34,12 @@ class Image:
         self.config = config
 
     def __enter__(self) -> "Image":
-        self.output_dir = Path(os.getenv("TMPDIR", "/var/tmp")) / uuid.uuid4().hex[:16]
+        if (cache := INVOKING_USER.cache_dir()) and os.access(cache, os.W_OK):
+            tmpdir = cache
+        else:
+            tmpdir = Path("/var/tmp")
+
+        self.output_dir = Path(os.getenv("TMPDIR", tmpdir)) / uuid.uuid4().hex[:16]
 
         return self