From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 7 Mar 2024 21:00:48 +0000 (+0100)
Subject: Fix cleaning of package cache directory
X-Git-Tag: v22~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14fe4426051227fced66a3f9d82823d291d0afff;p=thirdparty%2Fmkosi.git

Fix cleaning of package cache directory
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 4e02d6d89..efdfda4e9 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3789,14 +3789,14 @@ def run_clean(args: Args, config: Config, *, resources: Path) -> None:
 
     if (
         remove_package_cache and
-        config.package_cache_dir and
-        config.package_cache_dir.exists() and
-        any(config.package_cache_dir.iterdir())
+        any(config.package_cache_dir_or_default().glob("*"))
     ):
+        subdir = config.distribution.package_manager(config).subdir(config)
+
         with complete_step(f"Clearing out package cache of {config.name()} image…"):
             rmtree(
                 *(
-                    config.package_cache_dir / d / config.distribution.package_manager(config).subdir(config)
+                    config.package_cache_dir_or_default() / d / subdir
                     for d in ("cache", "lib")
                 ),
             )