From: Daan De Meyer Date: Fri, 3 Jan 2025 20:10:25 +0000 (+0100) Subject: Don't try to remove cache entries of custom distro default initrd X-Git-Tag: v25~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a160d4a68359d50a5e1e65caebfe8ce0851a1f5;p=thirdparty%2Fmkosi.git Don't try to remove cache entries of custom distro default initrd --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index e09e7c1f4..b0ff5d369 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -4607,7 +4607,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None: for config in images: run_clean(args, config) - if args.force > 0: + if args.force > 0 and last.distribution != Distribution.custom: remove_cache_entries(finalize_default_initrd(last, tools=False, resources=resources)) rmtree(Path(".mkosi-private")) @@ -4688,10 +4688,11 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None: for config in images: run_clean(args, config) - initrd = finalize_default_initrd(last, tools=False, resources=resources) + if last.distribution != Distribution.custom: + initrd = finalize_default_initrd(last, tools=False, resources=resources) - if args.force > 1 or not have_cache(initrd): - remove_cache_entries(initrd) + if args.force > 1 or not have_cache(initrd): + remove_cache_entries(initrd) if tools and not (tools.output_dir_or_cwd() / tools.output).exists(): check_tools(tools, Verb.build)