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
@@ -197,7 +196,6 @@ _pkgctl_build_args=(
 	--pkgrel
 	--rebuild
 	--update-checksums
-	--version-upgrade
 	-e --edit
 
 	-r --release

contrib/completion/zsh/_devtools.in

@@ -59,7 +59,6 @@ _pkgctl_build_args=(
 	'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
 	'--rebuild[Increment the pkgrel variable]'
 	'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
-	'--version-upgrade[Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)]'
 	'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
 	'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
 	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"

doc/man/pkgctl-build.1.asciidoc

@@ -84,9 +84,6 @@ PKGBUILD Options
 	are either automatically updated when upgrading a package using `--pkgver`
 	or should remain immutable during rebuilds.
 
-*--version-upgrade*::
-	Adjust the PKGBUILD to match the latest upstream version (via `pkgctl version upgrade`).
-
 *-e, --edit*::
 	Edit the PKGBUILD before building
 

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/build/build.sh

@@ -67,7 +67,6 @@ pkgctl_build_usage() {
 		    --pkgrel=PKGREL      Set pkgrel to a given value
 		    --rebuild            Increment the current pkgrel variable
 		    --update-checksums   Force computation and update of the checksums (disables auto-detection)
-		    --version-upgrade    Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)
 		    -e, --edit           Edit the PKGBUILD before building
 
 		RELEASE OPTIONS
@@ -117,7 +116,6 @@ pkgctl_build() {
 	fi
 
 	local UPDATE_CHECKSUMS=0
-	local VERSION_UPGRADE=0
 	local EDIT=0
 	local REBUILD=0
 	local OFFLOAD=0
@@ -189,10 +187,6 @@ pkgctl_build() {
 				UPDATE_CHECKSUMS=1
 				shift
 				;;
-			--version-upgrade)
-				VERSION_UPGRADE=1
-				shift
-				;;
 			--rebuild)
 				# shellcheck source=src/lib/util/git.sh
 				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
@@ -458,13 +452,6 @@ pkgctl_build() {
 			. ./PKGBUILD
 		fi
 
-		# update PKGBUILD to the latest upstream version
-		if (( VERSION_UPGRADE )); then
-			if ! $(pkgctl_version_upgrade); then
-				die
-			fi
-		fi
-
 		# execute build
 		for arch in "${BUILD_ARCH[@]}"; do
 			if [[ -n $arch ]]; then

src/lib/license/setup.sh

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