Merge branch 'github/fork/petronny/master' into 'master'

archbuild: read CacheDir from corresponding pacman.conf when mkarchchroot See merge request archlinux/devtools!50
fix(commitpkg): Quiet git ls-files output
2025-09-13 09:56:18 +02:00 · 2025-08-03 05:27:55 +00:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2020-06-24 21:51:04 +08:00
3 changed files with 8 additions and 3 deletions
--- a/src/archbuild.in
+++ b/src/archbuild.in
@@ -78,6 +78,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG

 # Pass all arguments after -- right to makepkg
 makechrootpkg_args+=("${@:$OPTIND}")
+cachedir=$(pacman-conf -c "${pacman_config}" CacheDir)

 # Automatically recreate the root chroot if a version mismatch is detected
 CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
@@ -105,6 +106,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	setarch "${set_arch}" mkarchroot \
 		-C "${pacman_config}" \
 		-M "${makepkg_config}" \
+		-c "${cachedir}" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
 else
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -123,9 +123,10 @@ fi
 needsversioning=()

 if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
-	error "package doesn't have proper licensing information, set it up using:"
+	# TODO: Make this a hard failure in the future after packagers have had
+	# some time to add licenses to all packages.
+	warning "package doesn't have proper licensing information, set it up using:"
 	msg2 'pkgctl license setup'
-	exit 1
 else
 	pkgctl license check
 	needsversioning+=(REUSE.toml LICENSE LICENSES/*)
@@ -154,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",
Author	SHA1	Message	Date
Kristian Klausen	57f0511628	Merge branch 'github/fork/petronny/master' into 'master' archbuild: read CacheDir from corresponding pacman.conf when mkarchchroot See merge request archlinux/devtools!50	2025-08-03 05:27:55 +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
Jingbei Li	cdaf0cf86f	archbuild: read CacheDir from corresponding pacman.conf when mkarchchroot	2020-06-24 21:51:04 +08:00