user: Make INVOKING_USER.cache_dir() return the user cache directory

diff --git a/mkosi/config.py b/mkosi/config.py
index 77d25e997bd296bf22ebb21242778d28ff5bf968..ee140e873b665c4eb160f667380670dc772c1233 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2096,10 +2096,10 @@ class Config:
 
         if (
             (cache := INVOKING_USER.cache_dir())
-            and cache != Path("/var/cache/mkosi")
+            and cache != Path("/var/cache")
             and os.access(cache, os.W_OK)
         ):
-            return cache
+            return cache / "mkosi"
 
         return Path("/var/tmp")
 
@@ -2107,7 +2107,7 @@ class Config:
         key = f"{self.distribution}~{self.release}~{self.architecture}"
         if self.mirror:
             key += f"-{self.mirror.replace('/', '-')}"
-        return self.package_cache_dir or (INVOKING_USER.cache_dir() / key)
+        return self.package_cache_dir or (INVOKING_USER.cache_dir() / "mkosi" / key)
 
     def tools(self) -> Path:
         return self.tools_tree or Path("/")

diff --git a/mkosi/user.py b/mkosi/user.py
index 78f9bc5f74f04b15b9dfe3e09f8f253d6359b594..3daafc92d5fd4df7134bbb02b0a7f8e1feef7444 100644 (file)
--- a/mkosi/user.py
+++ b/mkosi/user.py
@@ -42,7 +42,7 @@ class INVOKING_USER:
         else:
             cache = Path("/var/cache")
 
-        return cache / "mkosi"
+        return cache
 
     @classmethod
     def runtime_dir(cls) -> Path:

diff --git a/tests/__init__.py b/tests/__init__.py
index 98a0aec29e56a87ed4b7760938cdfedd29d9adeb..f2e3989b598dd3c20624b69cd5ebf93c88c13b89 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -34,7 +34,7 @@ class Image:
         self.config = config
 
     def __enter__(self) -> "Image":
-        if (cache := INVOKING_USER.cache_dir()) and os.access(cache, os.W_OK):
+        if (cache := INVOKING_USER.cache_dir() / "mkosi") and os.access(cache, os.W_OK):
             tmpdir = cache
         else:
             tmpdir = Path("/var/tmp")