[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible: build: (re-try) harder to get debbindiff saving files in a defined temporary directory

[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 752bc4db0d48be2fb0454b645469c945c9326d9d
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Wed Jun 17 23:04:12 2015 +0000

    reproducible: build: (re-try) harder to get debbindiff saving files in a defined temporary directory
---
 bin/reproducible_build.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 38abb2d..a8d1f48 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -238,7 +238,7 @@ call_debbindiff() {
 		DBDSUITE="unstable"
 	fi
 	# TEMP is recognized by python's tempfile module to create temp stuff inside
-	export TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
+	local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
 	local OLD_DEBBINDIFF_TMP_COUNT=$(find "$TEMP" -maxdepth 1 -name tmp*debbindiff | wc -l)
 	DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 	echo "$(date) - $DBDVERSION will be used to compare the two builds:" | tee -a ${RBUILDLOG}
@@ -247,10 +247,10 @@ call_debbindiff() {
 	( timeout $TIMEOUT schroot \
 		--directory $TMPDIR \
 		-c source:jenkins-reproducible-${DBDSUITE}-debbindiff \
-		debbindiff -- \
-			--html ./${DBDREPORT} \
-			./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
-			./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 \
+		-- sh -c "export TMPDIR=$TEMP ; debbindiff \
+			--html $TMPDIR/${DBDREPORT} \
+			$TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
+			$TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes" \
 	) 2>&1 >> $TMPLOG
 	RESULT=$?
 	if ! "$DEBUG" ; then set +x ; fi
@@ -262,7 +262,6 @@ call_debbindiff() {
 	if [ "$OLD_DEBBINDIFF_TMP_COUNT" != "$NEW_DEBBINDIFF_TMP_COUNT" ]; then
 		irc_msg "debbindiff calls on $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE or ${BUILD_URL}console left cruft, please help investigate and fix 788568"
 	fi
-	unset TEMP
 	case $RESULT in
 		0)
 			handle_reproducible

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