]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Fix cleaning of package cache directory
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 7 Mar 2024 21:00:48 +0000 (22:00 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 8 Mar 2024 09:28:42 +0000 (10:28 +0100)
mkosi/__init__.py

index 4e02d6d89dc015147d9bc85b3eba07c34c9e753b..efdfda4e98787a7668b515aa6a5c58bd2a02224b 100644 (file)
@@ -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")
                 ),
             )