[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: build: always print how much the package took to build in rbuild, not only when the build succeeded

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 60167da31a58f77de864bfc5f35d1e3ecb75f15e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Jan 5 14:40:58 2016 +0000

    reproducible: build: always print how much the package took to build in rbuild, not only when the build succeeded
---
 bin/reproducible_build.sh  | 2 +-
 bin/reproducible_common.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index d5939c3..b06e529 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -396,7 +396,6 @@ call_diffoscope_on_changes_files() {
 			irc_message "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it. Please check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE"
 			;;
 	esac
-	print_out_duration
 }
 
 choose_package() {
@@ -794,6 +793,7 @@ if [ $FTBFS -eq 1 ] ; then
 elif [ $FTBFS -eq 0 ] ; then
 	call_diffoscope_on_changes_files  # defines DIFFOSCOPE, update_db_and_html defines STATUS
 fi
+print_out_duration
 
 cd ..
 cleanup_all
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index fc15b86..b354f42 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -496,6 +496,9 @@ calculate_build_duration() {
 }
 
 print_out_duration() {
+	if [ -z "$DURATION" ]; then
+		return
+	fi
 	local HOUR=$(echo "$DURATION/3600"|bc)
 	local MIN=$(echo "($DURATION-$HOUR*3600)/60"|bc)
 	local SEC=$(echo "$DURATION-$HOUR*3600-$MIN*60"|bc)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git