Merge branch 'fix/clean-makepkg.conf.d' into 'master'

Draft: fix(arch-nspawn): clean all existing makepkg conf.d files before overriding See merge request archlinux/devtools!308
fix(license): add .gitignore to REUSE defaults
2025-09-12 17:36:18 +02:00 · 2025-08-11 01:34:49 +02:00 · 2025-08-08 14:13:32 +02:00 · 2025-02-25 21:41:57 +01:00
2 changed files with 4 additions and 0 deletions
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -116,6 +116,9 @@ copy_hostconf () {
 		cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
 		if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then
 			mkdir --parents "$working_dir/etc/makepkg.conf.d/"
+			if is_globfile "$working_dir/etc/makepkg.conf.d"/*.conf; then
+				rm --force "$working_dir/etc/makepkg.conf.d"/*.conf
+			fi
 			cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/"
 		fi
 	fi
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,6 +188,7 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
+    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
Author	SHA1	Message	Date
Levente Polyak	23505b2f5e	Merge branch 'fix/clean-makepkg.conf.d' into 'master' Draft: fix(arch-nspawn): clean all existing makepkg conf.d files before overriding See merge request archlinux/devtools!308	2025-08-11 01:34:49 +02:00
Aaron Liu	3f0ebbc6d2	fix(license): add .gitignore to REUSE defaults 36 packages use this while 26 use .pam and 21 use .logrotate. Seems anecdotally common enough to add this here.	2025-08-08 14:13:32 +02:00
Levente Polyak	19728506e3	wip: clean all existing makepkg conf.d files before overriding	2025-02-25 21:41:57 +01:00