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>

contrib/completion/bash/devtools.in

@@ -150,7 +150,6 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
-	license
 	release
 	repo
 	search

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

src/checkpkg.in

@@ -90,11 +90,7 @@ if [[ ${arch[0]} == 'any' ]]; then
 fi
 
 STARTDIR=$(pwd)
-if (( RMDIR )); then
+(( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-	# lib/common.sh sets up traps for cleanup, the following will override them
-	trap 'rm -rf "$TEMPDIR"; trap_abort' INT QUIT TERM HUP
-	trap 'rm -rf "$TEMPDIR"; trap_exit' EXIT
-fi
 TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
 
 for _pkgname in "${pkgname[@]}"; do

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file" >/dev/null; then
+		if ! git ls-files --error-unmatch "$file"; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/diffpkg.in

@@ -182,8 +182,8 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 fi
 
 STARTDIR=$(pwd)
-[[ -z ${WORKDIR:-} ]] && setup_workdir
+trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
-TMPDIR=$(mktemp -d --tmpdir="$WORKDIR" diffpkg-script.XXXXXXXX)
+TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
 export TMPDIR
 
 tar_list() {

src/export-pkgbuild-keys.in

@@ -50,8 +50,8 @@ if (( ${#validpgpkeys[@]} == 0 )); then
 	exit 0
 fi
 
-[[ -z ${WORKDIR:-} ]] && setup_workdir
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir="$WORKDIR" export-pkgbuild-keys.XXXXXXXXXX)
+TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
 
 mkdir -p keys/pgp
 error=0

src/lib/license/setup.sh

@@ -191,9 +191,7 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
-    "*sysusers.conf",
     "*.tmpfiles",
-    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/makerepropkg.in

@@ -242,8 +242,8 @@ for fname in "${installed[@]}"; do
     fi
 done
 
-[[ -z ${WORKDIR:-} ]] && setup_workdir
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir="$WORKDIR" makerepropkg.XXXXXXXXXX)
+TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
 
 makepkg_conf="${TEMPDIR}/makepkg.conf"
 # anything before buildtool support is pinned to the last none buildtool aware release