From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 6 May 2024 15:11:21 +0000 (+0200)
Subject: Be more conservative in what we copy from package directories
X-Git-Tag: v23.1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecaef3b14650c2d6848672ab34aebd6dbb5d8fe;p=thirdparty%2Fmkosi.git

Be more conservative in what we copy from package directories

Let's make sure we only copy packages from package directories so
that PackageDirectories= can be pointed at a directory containing
more than just packages without copying everything.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 87fe3357f..949938437 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1609,11 +1609,14 @@ def install_package_directories(context: Context) -> None:
 
     with complete_step("Copying in extra packages…"):
         for d in context.config.package_directories:
-            copy_tree(
-                d, context.packages,
-                use_subvolumes=context.config.use_subvolumes,
-                sandbox=context.sandbox,
-            )
+            for p in itertools.chain(
+                d.glob("*.rpm*"),
+                d.glob("*.pkg.tar*"),
+                d.glob("*.deb*"),
+                d.glob("*.ddeb*"),
+                d.glob("*.udeb*"),
+            ):
+                shutil.copy(p, context.packages, follow_symlinks=True)
 
     if context.want_local_repo():
         with complete_step("Building local package repository"):