From 03b2e06697a5919d841c741f401620e21a4c3bbd Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Wed, 9 Mar 2022 16:23:02 -0800
Subject: pkg repo: Be more verbose and catch errors better.

Issue #985
---
 src/share/poudriere/common.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 242e9c5b..a76c3496 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -8366,6 +8366,7 @@ sign_pkg() {
 	local sigtype="$1"
 	local pkgfile="$2"
 
+	msg "Signing pkg bootstrap with method: ${sigtype}"
 	if [ "${sigtype}" = "fingerprint" ]; then
 		unlink "${pkgfile}.sig"
 		sha256 -q "${pkgfile}" | ${SIGNING_COMMAND} > "${pkgfile}.sig"
@@ -8400,15 +8401,20 @@ build_repo() {
 	fi
 	mkdir -p ${MASTERMNT}/tmp/packages
 	if [ -n "${PKG_REPO_SIGNING_KEY}" ]; then
+		msg "Signing repository with key: ${PKG_REPO_SIGNING_KEY}"
 		install -m 0400 ${PKG_REPO_SIGNING_KEY} \
 			${MASTERMNT}/tmp/repo.key
 		injail ${PKG_BIN} repo \
 			${pkg_repo_list_files} \
 			-o /tmp/packages \
 			${PKG_META} \
-			/packages /tmp/repo.key
+			/packages /tmp/repo.key ||
+		    err "$?" "Failed to sign pkg repository"
 		unlink ${MASTERMNT}/tmp/repo.key
 	elif [ "${PKG_REPO_FROM_HOST:-no}" = "yes" ]; then
+		if [ -n "${SIGNING_COMMAND-}" ]; then
+			msg "Signing repository with command: ${SIGNING_COMMAND}"
+		fi
 		# Sometimes building repo from host is needed if
 		# using SSH with DNSSEC as older hosts don't support
 		# it.
@@ -8416,12 +8422,17 @@ build_repo() {
 		    ${pkg_repo_list_files} \
 		    -o ${MASTERMNT}/tmp/packages ${PKG_META_MASTERMNT} \
 		    ${MASTERMNT}/packages \
-		    ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}}
+		    ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}} ||
+		    err "$?" "Failed to sign pkg repository"
 	else
+		if [ -n "${SIGNING_COMMAND-}" ]; then
+			msg "Signing repository with command: ${SIGNING_COMMAND}"
+		fi
 		JNETNAME="n" injail ${PKG_BIN} repo \
 		    ${pkg_repo_list_files} \
 		    -o /tmp/packages ${PKG_META} /packages \
-		    ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}}
+		    ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}} ||
+		    err "$?" "Failed to sign pkg repository"
 	fi
 	cp ${MASTERMNT}/tmp/packages/* ${PACKAGES}/
 
-- 
cgit v1.2.3