summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-19 13:24:47 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-19 13:24:47 +0100
commitd7d275fc316f678a4c2857e54ce92f66df168026 (patch)
tree76ebd6d1f212ce6c8b0ade6358d1ba0de4cd99fe
parentb7782e1c6da1e1497b760dc138a4f43b1ab00ede (diff)
downloadjenkins.debian.net-d7d275fc316f678a4c2857e54ce92f66df168026.tar.xz
reproducible: try harder to get debbindiff stderr into the preserved rbuild.log
-rwxr-xr-xbin/reproducible_build.sh2
1 files changed, 1 insertions, 1 deletions
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