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(completion): fix bash completion for the license subcommand
2025-09-12 17:36:18 +02:00 · 2025-08-07 10:44:30 +02:00 · 2025-08-05 17:48:12 +02:00 · 2025-02-25 21:41:57 +01:00
2 changed files with 4 additions and 0 deletions
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search
--- 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
Author	SHA1	Message	Date
Levente Polyak	c44039365c	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-07 10:44:30 +02:00
Jakub Klinkovský	fc56ebedf3	fix(completion): fix bash completion for the license subcommand Signed-off-by: Jakub Klinkovský <lahwaacz@archlinux.org>	2025-08-05 17:48:12 +02:00
Levente Polyak	19728506e3	wip: clean all existing makepkg conf.d files before overriding	2025-02-25 21:41:57 +01:00