summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-16 12:21:03 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-16 12:21:03 +0200
commitbff818eba4fe1c6bc49b728f2e351d80a5ac6598 (patch)
tree6a4ee4d6fb5ff5f3cc855407b98b83f6836af2fa
parent231381ecda2a99fe7fd6e95d9a334cf1c17e70e1 (diff)
downloadjenkins.debian.net-bff818eba4fe1c6bc49b728f2e351d80a5ac6598.tar.xz
Revert "reproducible: check pbuilder return code and explain if it was killed by timeout"
This reverts commit 231381ecda2a99fe7fd6e95d9a334cf1c17e70e1.
-rwxr-xr-xbin/reproducible_build.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ea51d1b2..a8d27e25 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -559,10 +559,6 @@ EOF
--logfile b1/build.log \
${SRCPACKAGE}_${EVERSION}.dsc
) 2>&1 | tee -a $RBUILDLOG
- PRESULT=${PIPESTATUS[0]}
- if [ $PRESULT -eq 124 ] ; then
- echo "$(date -u) - pbuilder was killed by timeout after 12h." | tee -a b1/build.log $RBUILDLOG
- fi
if ! "$DEBUG" ; then set +x ; fi
rm $TMPCFG
}
@@ -600,11 +596,7 @@ EOF
--basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz \
--buildresult $TMPDIR/b2 \
--logfile b2/build.log \
- ${SRCPACKAGE}_${EVERSION}.dsc | true # pbuilder exits with 1 on ftbfs, we use | instead of || so we can get the pipestatus
- PRESULT=${PIPESTATUS[0]}
- if [ $PRESULT -eq 124 ] ; then
- echo "$(date -u) - pbuilder was killed by timeout after 12h." | tee -a b2/build.log
- fi
+ ${SRCPACKAGE}_${EVERSION}.dsc || true # exit with 1 when ftbfs
if ! "$DEBUG" ; then set +x ; fi
rm $TMPCFG
}