[Qa-jenkins-scm] [jenkins.debian.net] 02/05: reproducible: build: set +x IFF $DEBUG is false

[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 effc564e0c219cc167295c0c0ea623f3fd5ed92b
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Thu Apr 30 18:42:01 2015 +0200

    reproducible: build: set +x IFF $DEBUG is false
---
 bin/reproducible_build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0295c6f..4355f63 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -261,7 +261,7 @@ call_debbindiff() {
 			./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 \
 	) 2>&1 >> $TMPLOG
 	RESULT=$?
-	set +x
+	if ! "$DEBUG" ; then set +x ; fi
 	set -e
 	cat $TMPLOG | tee -a $RBUILDLOG  # print out dbd output
 	rm -f $DBDCHROOT_READLOCK $TMPLOG
@@ -379,7 +379,7 @@ build_rebuild() {
 		--distribution ${SUITE} \
 		${SRCPACKAGE}_*.dsc \
 	) 2>&1 | tee -a $RBUILDLOG
-	set +x
+	if ! "$DEBUG" ; then set +x ; fi
 	if [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
 		# the first build did not FTBFS, try rebuild it.
 		check_for_race_conditions
@@ -404,7 +404,7 @@ build_rebuild() {
 					--distribution ${SUITE} \
 					${SRCPACKAGE}_${EVERSION}.dsc
 		) 2>&1 | tee -a ${RBUILDLOG}
-		set +x
+	if ! "$DEBUG" ; then set +x ; fi
 		if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
 			# both builds were fine, i.e., they did not FTBFS.
 			FTBFS=0

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