From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 1 Feb 2024 11:32:43 +0000 (+0100)
Subject: Decouple base trees from repository metadata snapshot
X-Git-Tag: v21~75^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2339%2Fhead;p=thirdparty%2Fmkosi.git

Decouple base trees from repository metadata snapshot

The syncing can be disabled with CacheOnly=metadata and we already
don't use repository metadata that's already populated so let's not
imply anything specific when using base trees so that base trees
without repository metadata can still be used to build extension
images.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 2b9253621..7cbc22d9c 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2946,7 +2946,7 @@ def setup_workspace(args: Args, config: Config) -> Iterator[Path]:
 
 
 def copy_repository_metadata(context: Context) -> None:
-    if have_cache(context.config) or context.config.base_trees:
+    if have_cache(context.config):
         return
 
     subdir = context.config.distribution.package_manager(context.config).subdir(context.config)
@@ -3601,7 +3601,7 @@ def rchown_package_manager_dirs(config: Config) -> Iterator[None]:
 
 
 def sync_repository_metadata(args: Args, config: Config, *, resources: Path) -> None:
-    if have_cache(config) or config.cacheonly != Cacheonly.none or config.base_trees:
+    if have_cache(config) or config.cacheonly != Cacheonly.none:
         return
 
     with (