From effc564e0c219cc167295c0c0ea623f3fd5ed92b Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Thu, 30 Apr 2015 18:42:01 +0200 Subject: reproducible: build: set +x IFF $DEBUG is false --- bin/reproducible_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/reproducible_build.sh') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 0295c6f2..4355f634 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 -- cgit v1.2.3-70-g09d2