feat(commitpkg): Change warning to hard error when licensing information is absent

We originally had this as a warning to allow packagers some time for transitioning.
However, now the gloves come off and we will require all packages to have proper licensing
information.

contrib/completion/bash/devtools.in

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

src/commitpkg.in

@@ -123,10 +123,9 @@ fi
 needsversioning=()
 
 if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
-	# 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:"
+	error "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/*)
@@ -155,7 +154,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

@@ -188,13 +188,10 @@ path = [
     "README.md",
     "keys/**",
     ".SRCINFO",
-    ".gitignore",
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
-    "*sysusers.conf",
     "*.tmpfiles",
-    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/makechrootpkg.in

@@ -150,9 +150,7 @@ install_packages() {
 	pkgnames=("${install_pkgs[@]##*/}")
 
 	cp -- "${install_pkgs[@]}" "$copydir/root/"
-	arch-nspawn "$copydir" \
-		--machine="$(display_name installing "${pkgnames[@]}")" \
-		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
+	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
 	ret=$?
 	rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -293,33 +291,6 @@ move_products() {
 		fi
 	done
 }
-
-# Usage: display_name verb pkgname [pkgname...]
-display_name() {
-	local max_hostname max_pkgnames_length max_pid_digits pkgnames tool verb
-
-	max_hostname=64  # see gethostname(2)
-	num_joiner_chars=3  # see template string below
-	max_pid_digits=7  # ceil(log(2^22, 10))
-
-	tool="${0##*/}"
-	verb="${1?}"
-	shift
-	max_pkgnames_length=$((
-		max_hostname - num_joiner_chars - max_pid_digits - "${#tool}" - "${#verb}"
-	))
-	# Normalize the package name so it doubles as a valid hostname
-	# https://github.com/systemd/systemd/blob/v256/src/basic/hostname-util.c#L83-L136
-	pkgnames="$(
-		tr -s -c 'a-z0-9 ' - <<< "$*" | tr ' ' . | head -c ${max_pkgnames_length}
-	)"
-
-	if [[ $# -eq 0 ]]; then
-		printf '%s.%s.%s' "${tool}" "${verb}" $$
-	else
-		printf '%s.%s.%s.%s' "${tool}" "${verb}" "${pkgnames%%-}" $$
-	fi
-}
 # }}}
 
 while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
@@ -397,7 +368,6 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
 fi
 
 (( update_first )) && arch-nspawn "$copydir" \
-		--machine="$(display_name updating)" \
 		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -Syuu --noconfirm
 
@@ -426,19 +396,11 @@ nspawn_build_args=(
 	"${bindmounts_tmpfs[@]}"
 )
 
-{
-	read -r -d $'\n' pkgbase
-	mapfile -t pkgnames
-} < <(sudo -u "$makepkg_user" bash -c '
-		source PKGBUILD
-		printf "%s\n" "${pkgbase:-${pkgname}}" "${pkgname[@]}"
-')
-
 if arch-nspawn "$copydir" \
 	"${nspawn_build_args[@]}" \
-	--machine="$(display_name building "${pkgbase}")" \
 	/chrootbuild "${makepkg_args[@]}"
 then
+	mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
 	move_products
 else
 	(( ret += 1 ))
@@ -451,11 +413,8 @@ if [[ $inspect == always ]] || ( [[ $inspect == failure ]] && (( ret != 0 )) );
 	else
 		error "Build failed, inspecting %s" "$copydir"
 	fi
-	# Use a short machine name without dots so the shell picks it up
-	# as part of the window title
 	arch-nspawn "$copydir" \
 		"${nspawn_build_args[@]}" \
-		--machine="inspecting-$$" \
 		--user=builduser \
 		--chdir=/build
 fi
@@ -485,9 +444,7 @@ else
 		for remotepkg in "${remotepkgs[@]}"; do
 			if [[ $remotepkg != file://* ]]; then
 				msg2 "Downloading current versions"
-				arch-nspawn "$copydir" \
-					--machine="$(display_name downloading "${pkgnames[@]}")" \
-					pacman --noconfirm -Swdd "${pkgnames[@]}"
+				arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
 				mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
 					--dbpath "$copydir"/var/lib/pacman \
 					-Sddp "${pkgnames[@]}")