From e453a62175469165928ff177cbfe5f7ce71124c6 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Mon, 6 Apr 2015 18:10:01 +0200 Subject: reproducible: build: refactor: first define of RBUILDLOG globally at the very start: we use it from the start, cant' be defined in a function --- bin/reproducible_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 52aa83bc..f6dfa890 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -300,7 +300,6 @@ check_suitability() { build_rebuild() { FTBFS=1 local TMPLOG=$(mktemp --tmpdir=$TMPDIR) - local RBUILDLOG=$(mktemp --tmpdir=$TMPDIR) # FIXME check wheter my changes here are fine local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR) local NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l) mkdir b1 b2 @@ -370,6 +369,7 @@ cd $TMPDIR DATE=$(date +'%Y-%m-%d %H:%M') START=$(date +'%s') +RBUILDLOG=$(mktemp --tmpdir=$TMPDIR) # FIXME check wheter my changes here are fine choose_package # defines SUITE, PKGID, SRCPACKAGE, SCHEDULED_DATE, SAVE_ARTIFACTS @@ -385,7 +385,7 @@ EVERSION=$(echo $VERSION | cut -d ":" -f2) # EPOCH_FREE_VERSION was too long cat ${SRCPACKAGE}_${EVERSION}.dsc | tee -a ${RBUILDLOG} check_suitability -build_rebuild # defines FTBFS, RBUILDLOG +build_rebuild # defines FTBFS redefines RBUILDLOG if [ $FTBFS -eq 0 ] ; then call_debbindiff # defines DBDVERSION fi -- cgit v1.2.3-70-g09d2