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>

doc/man/makechrootpkg.1.asciidoc

@@ -79,9 +79,6 @@ Options
 *-x* <when>::
 	Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
 
-*-s* <args>::
-	Additional systemd-nspawn args (comma-separated) for the arch-nspawn build phase
-
 See Also
 --------
 

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/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/lib/license/setup.sh

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

src/makechrootpkg.in

@@ -39,7 +39,6 @@ inspect=never
 bindmounts_ro=()
 bindmounts_rw=()
 bindmounts_tmpfs=()
-nspawn_add_args=()
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -85,8 +84,6 @@ usage() {
 	echo '-T                Build in a temporary directory'
 	echo '-U                Run makepkg as a specified user'
 	echo '-x <when>         Inspect chroot after build (never, always, failure)'
-	echo '-s <args>         Additional systemd-nspawn args (comma-separated) for'
-	echo '                  the arch-nspawn build phase'
 	exit 1
 }
 
@@ -296,7 +293,7 @@ move_products() {
 }
 # }}}
 
-while getopts 'hcur:I:l:nCTD:d:U:x:t:s:' arg; do
+while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
 	case "$arg" in
 		c) clean_first=1 ;;
 		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
@@ -311,7 +308,6 @@ while getopts 'hcur:I:l:nCTD:d:U:x:t:s:' arg; do
 		T) temp_chroot=1; copy+="-$$" ;;
 		U) makepkg_user="$OPTARG" ;;
 		x) inspect="$OPTARG" ;;
-		s) IFS=, read -ra nspawn_add_args <<< "$OPTARG" ;;
 		h|*) usage ;;
 	esac
 done
@@ -398,7 +394,6 @@ nspawn_build_args=(
 	"${bindmounts_ro[@]}"
 	"${bindmounts_rw[@]}"
 	"${bindmounts_tmpfs[@]}"
-	"${nspawn_add_args[@]}"
 )
 
 if arch-nspawn "$copydir" \