From 6339c8371e5fa6dc9b404c2b18b3226c770ec505 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 6 Oct 2014 17:33:29 +0200
Subject: reproducible: fix timeout handling

---
 bin/reproducible_build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0060e2bf..004c53ef 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -173,7 +173,11 @@ for SRCPACKAGE in ${PACKAGES} ; do
 			LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc)
 			LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html)
 			BUILDINFO=${SRCPACKAGE}_${EVERSION}_amd64.buildinfo
-			timeout 15m /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes 2>&1 > ${RBUILDLOG} || echo "debbindiff.py was auto killed..." >> ./${LOGFILE}
+			timeout 15m /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes 2>&1 > ${RBUILDLOG}
+			RESULT=$?
+			if [ $RESULT -eq 124 ] ; then
+				echo "$(date) - debbindiff.py was killed after running into timeouot..." >> ./${RBUILDLOG}
+			fi
 			if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
 				cleanup_userContent
 				cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/
-- 
cgit v1.2.3-70-g09d2