[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible debian: build: fix variable name

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
97e76c98 by Mattia Rizzolo at 2021-10-05T16:11:34+02:00
reproducible debian: build: fix variable name

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
299ab336 by Mattia Rizzolo at 2021-10-05T16:13:08+02:00
reproducible debian: build: improve log reporting

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
f831f1a1 by Mattia Rizzolo at 2021-10-05T16:13:57+02:00
reproducible debian: build: include stderr in the output here

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -265,8 +265,8 @@ handle_ftbr() {
 	local FTBRmessage="$@"
 	log_error "${SRCPACKAGE} failed to build reproducibly in ${SUITE} on ${ARCH}."
 	cp b1/${BUILDINFO} $DEBIAN_BASE/buildinfo/${SUITE}/${ARCH}/ > /dev/null 2>&1 || true  # will fail if there is no .buildinfo
-	if [ ! -z "$FTRmessage" ] ; then
-		log_error "${FTBRmessage}."
+	if [ -n "$FTBRmessage" ] ; then
+		log_error "${FTBRmessage}"
 	fi
 	if [ -f ./${DBDREPORT} ] ; then
 		mv ./${DBDREPORT} $DEBIAN_BASE/dbd/${SUITE}/${ARCH}/
@@ -346,20 +346,20 @@ call_diffoscope_on_changes_files() {
 	fi
 	# diffoscope temporary files are going to end up in this
 	TEMP=$(mktemp --tmpdir="$TMPDIR" -d dbd-tmp-XXXXXXX)
-	if ! session=$(schroot --begin-session -c "chroot:jenkins-reproducible-$DBDSUITE-diffoscope") ; then
+	if ! session=$(schroot --begin-session -c "chroot:jenkins-reproducible-$DBDSUITE-diffoscope" 2>&1) ; then
 		# FIXME: probably this (and the one below) should not end in a FTPR, but rather some tempfail situation.
 		RESULT=99
 		DIFFOSCOPE="diffoscope (schroot error—uset)"
-		MSG_PART1="The schroot service is not available.  Error message:"
-		handle_ftbr "$MSG_PART1" "\n" "$session"
+		MSG_PART1="The schroot service is not available."
+		handle_ftbr "$MSG_PART1" "Error message:"  "\n" "$session"
 		irc_message debian-reproducible-changes "$MSG_PART1 Please check $RBUILDLOG and $DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE"
 		return
 	fi
 	if ! diffoscope_version=$(schroot --directory "$TMPDIR" --run-session -c "$session" diffoscope -- --version 2>&1) ; then
 		RESULT=98
 		DIFFOSCOPE="diffoscope (diffoscope error—unset)"
-		MSG_PART1="First call to diffoscope failed.  Error message:"
-		handle_ftbr "$MSG_PART1" "\n" "$diffoscope_version"
+		MSG_PART1="First call to diffoscope failed."
+		handle_ftbr "$MSG_PART1" "Error message:"  "\n" "$diffoscope_version"
 		irc_message debian-reproducible-changes "$MSG_PART1 Please check $RBUILDLOG and $DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE"
 		return
 	fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/83cb0c67d982b40bace017a800dd1ea970bcf983...f831f1a1faccc2443791e9e3a685c68f2bb6347e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/83cb0c67d982b40bace017a800dd1ea970bcf983...f831f1a1faccc2443791e9e3a685c68f2bb6347e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20211005/dba95147/attachment-0001.htm>