Merge branch '272-check-for-chroot-version-file' into 'master'

fix: Reduce verbosity if version file is missing Closes #272 See merge request archlinux/devtools!321
fix(commitpkg): Quiet git ls-files output
2025-09-13 18:06:19 +02:00 · 2025-08-02 07:04:22 +02:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2025-07-28 18:30:49 +02:00
3 changed files with 4 additions and 2 deletions
--- a/src/archbuild.in
+++ b/src/archbuild.in
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 makechrootpkg_args+=("${@:$OPTIND}")
 # Automatically recreate the root chroot if a version mismatch is detected
-CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
 if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
 	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
 	clean_first=true
--- 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",
Author	SHA1	Message	Date
Christian Heusel	007a03cc8d	Merge branch '272-check-for-chroot-version-file' into 'master' fix: Reduce verbosity if version file is missing Closes #272 See merge request archlinux/devtools!321	2025-08-02 07:04:22 +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
Christian Heusel	8125a81a98	fix: Reduce verbosity if version file is missing As we don't check for the existance of the version file this would otherwise emit a useless error to the commandline: > ==> Building protobuf for [extra-staging] (x86_64) > cat: /var/lib/archbuild/extra-staging-x86_64/root/.arch-chroot: No such file or directory > ==> Creating chroot for [extra-staging] (x86_64)... Fix this by just silencing the error, as the check later also covers the case for empty `CURRENT_CHROOT_VERSION`. Fixes #272 Component: archbuild Signed-off-by: Christian Heusel <christian@heusel.eu>	2025-07-28 18:30:49 +02:00