[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "reproducible: check pbuilder return code and explain if it was killed by timeout"

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit bff818eba4fe1c6bc49b728f2e351d80a5ac6598
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Oct 16 12:21:03 2015 +0200

    Revert "reproducible: check pbuilder return code and explain if it was killed by timeout"
    
    This reverts commit 231381ecda2a99fe7fd6e95d9a334cf1c17e70e1.
---
 bin/reproducible_build.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ea51d1b..a8d27e2 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
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git