From d7d275fc316f678a4c2857e54ce92f66df168026 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 19 Mar 2015 13:24:47 +0100 Subject: reproducible: try harder to get debbindiff stderr into the preserved rbuild.log --- bin/reproducible_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index eb7edf76..c58414d6 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -72,7 +72,7 @@ call_debbindiff() { fi echo | tee -a ${RBUILDLOG} echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --version 2>&1) will be used to compare the two builds now." | tee -a ${RBUILDLOG} - ( timeout 15m schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ) 2>&1 >> ${RBUILDLOG} + ( timeout 15m schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 ) 2>&1 >> ${RBUILDLOG} RESULT=$? set +x set -e -- cgit v1.2.3-70-g09d2