Merge branch 'arch-nspawn-read-CacheDir-from-host' into 'master'

arch-nspawn: read CacheDir option from host's conf See merge request archlinux/devtools!95
fix(license): add .gitignore to REUSE defaults
2025-09-12 17:36:18 +02:00 · 2025-09-01 23:40:41 +03:00 · 2025-08-08 14:13:32 +02:00 · 2025-08-05 17:48:12 +02:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00
4 changed files with 6 additions and 2 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
@@ -69,7 +69,7 @@ nspawn_args=(
 )

 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi

 # shellcheck disable=2016
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,10 +188,13 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
+    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
Evangelos Foutras	b55d1fff84	Merge branch 'arch-nspawn-read-CacheDir-from-host' into 'master' arch-nspawn: read CacheDir option from host's conf See merge request archlinux/devtools!95	2025-09-01 23:40:41 +03: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
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
Christian Heusel	01757e6904	fix(commitpkg): Quiet git ls-files output So far all files in `needsversioning=(...)` have been printed to the command line if they were found, which is not useful, especially now that we have more files present there. It makes sense however to keep the standard error output, as this gives a actionable suggestion what one should to to fix the issue: > error: pathspec 'PKGBUILD' did not match any file(s) known to git > Did you forget to 'git add'? Fixes #281 Signed-off-by: Christian Heusel <christian@heusel.eu>	2025-08-01 11:26:57 +02:00
Daniel M. Capella	c5fe8ff3e6	feat(license): Extend matches for sysusers/tmpfiles configs Eg. to match: - sysusers.conf - $pkgname.sysusers - $pkgname.sysusers.conf	2025-07-28 23:38:32 -04:00
Evangelos Foutras	d0847a2a1c	arch-nspawn: read CacheDir option from host's conf This went unnoticed on build.archlinux.org until we tried switching away from its local /srv/ftp/ mirror. With a remote mirror, the chroots would ignore all the cached packages under /srv/ftp/pool/{packages,community}. With the local file:// mirror gone, arch-nspawn wouldn't mount the cache directories from the host into the chroot. The fix is to read the option from the host's pacman.conf, instead of the one given to arch-nspawn and the one existing inside the working directory.	2022-03-20 10:44:45 +02:00