From 332d333fa24c8b1943799aadb017f61e642008e1 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sun, 7 Sep 2025 17:32:13 +0200 Subject: libs: refactor recursive files helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Günzler --- bundles/s6/items.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bundles') diff --git a/bundles/s6/items.py b/bundles/s6/items.py index 2fd8370..597cdba 100644 --- a/bundles/s6/items.py +++ b/bundles/s6/items.py @@ -36,10 +36,10 @@ directories = { "/etc/s6-rc/services/services/contents.d": {} } -repo.libs.gen.add_files_recursive( - files, +repo.libs.gen.merge(files, repo.libs.gen.tree( join(repo.path, "bundles", "s6", "files"), -) + keep_parent=False, +)) svc_openrc = { "s6-rc-init": { -- cgit 1.4.1