summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-01-05 14:40:58 +0000
committerHolger Levsen <holger@layer-acht.org>2016-01-05 16:00:19 +0100
commit60167da31a58f77de864bfc5f35d1e3ecb75f15e (patch)
tree5148b8ea431f516d63062bbac923b31fbf25cfa4
parentbff970b0c95f7c6fe6f97a37465e55737150c2d1 (diff)
downloadjenkins.debian.net-60167da31a58f77de864bfc5f35d1e3ecb75f15e.tar.xz
reproducible: build: always print how much the package took to build in rbuild, not only when the build succeeded
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_common.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index d5939c37..b06e5298 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 fc15b868..b354f42b 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)