[Qa-jenkins-scm] [jenkins.debian.net] 02/04: reproducible: build: refactor: first define of RBUILDLOG globally at the very start: we use it from the start, cant' be defined in a function

[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 e453a62175469165928ff177cbfe5f7ce71124c6
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Mon Apr 6 18:10:01 2015 +0200

    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 52aa83b..f6dfa89 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

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