Merge branch 'fix-cachedir-from-custom-pacconf' into 'master'

fix(mkarchroot): query cache_dirs from pac_conf Closes #278 See merge request archlinux/devtools!314
fix(commitpkg): Quiet git ls-files output
2025-09-14 02:16:18 +02:00 · 2025-08-02 02:36:01 +00:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2025-06-23 20:22:35 +08:00
3 changed files with 4 additions and 2 deletions
--- 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
@@ -191,7 +191,9 @@ path = [
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
    "*sysusers.conf",
    "*.tmpfiles",
    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@@ -65,7 +65,7 @@ shift 1
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf ${pac_conf:+-c "$pac_conf"} CacheDir)
 fi
 umask 0022
Author	SHA1	Message	Date
Kailiang	1928483728	Merge branch 'fix-cachedir-from-custom-pacconf' into 'master' fix(mkarchroot): query cache_dirs from pac_conf Closes #278 See merge request archlinux/devtools!314	2025-08-02 02:36:01 +00: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
XU Kailiang	6ed548b260	fix(mkarchroot): query cache_dirs from pac_conf If mkarchroot is not given cache_dirs by `-c` flag, it queries them by calling pacman-conf. But previously this call ignores pacman config from `-C` flag. Fix this by using `pacman-conf -c "$pac_conf"` when a non-default pacman config is requested. Fixes #278 Component: mkarchroot	2025-06-23 20:22:35 +08:00