[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: refactoring, it's been called diffoscope since 2015 :)

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
854199c6 by Holger Levsen at 2022-09-16T23:29:25+02:00
reproducible Debian: refactoring, it's been called diffoscope since 2015 :)

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -320,7 +320,7 @@ handle_enospace() {
 	exit 0
 }
 
-dbd_timeout() {
+diffoscope_timed_out() {
 	local msg="$DIFFOSCOPE was killed after running into timeout after $1"
 	if [ ! -s ./${DBDREPORT} ] ; then
 		echo "$(date -u) - $DIFFOSCOPE produced no output and was killed after running into timeout after ${1}..." >> ${DBDREPORT}
@@ -387,7 +387,7 @@ call_diffoscope_on_changes_files() {
 	RESULT=$?
 	set -e
 	if ! "$DEBUG" ; then set +x ; fi
-	log_file $TMPLOG  # print dbd output
+	log_file $TMPLOG  # print diffoscope output
 	schroot --end-session -c "$session"
 	rm $TMPLOG
 	case $RESULT in
@@ -403,7 +403,7 @@ call_diffoscope_on_changes_files() {
 			handle_ftbr "$DIFFOSCOPE had trouble comparing the two builds. Please investigate $DEBIAN_URL/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log"
 			;;
 		124)
-			dbd_timeout $TIMEOUT
+			diffoscope_timed_out $TIMEOUT
 			;;
 		*)
 			# Process killed by signal exits with 128+${signal number}.



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/854199c674b6add9bf5326a1833bce1baaf5263e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/854199c674b6add9bf5326a1833bce1baaf5263e
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/20220916/20d2d587/attachment-0001.htm>