From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 29 Nov 2023 11:53:05 +0000 (+0100)
Subject: Stop using workspace cache subdirectory
X-Git-Tag: v20~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c1018992d169fad45db05374bfa613fa3cfcc55;p=thirdparty%2Fmkosi.git

Stop using workspace cache subdirectory

We don't do this for configured cache directories anymore, so don't
do it for workspace cache directories anymore either.
---

diff --git a/mkosi/state.py b/mkosi/state.py
index 1f9a61f89..a0fc84975 100644
--- a/mkosi/state.py
+++ b/mkosi/state.py
@@ -42,10 +42,7 @@ class MkosiState:
 
     @property
     def cache_dir(self) -> Path:
-        return (
-            self.config.cache_dir or
-            self.workspace / f"cache/{self.config.distribution}~{self.config.release}~{self.config.architecture}"
-        )
+        return self.config.cache_dir or (self.workspace / "cache")
 
     @property
     def install_dir(self) -> Path: