[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: build: try harder to get debbindiff saving files in a defined temporary directory
Holger Levsen
holger at moszumanska.debian.org
Wed Jun 17 22:47:00 UTC 2015
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 4ed8e3b32152f9a85a83ad1efd2fda1c6eb11743
Author: Mattia Rizzolo <mattia at mapreri.org>
Date: Wed Jun 17 18:04:47 2015 +0000
reproducible: build: try harder to get debbindiff saving files in a defined temporary directory
---
bin/reproducible_build.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 38abb2d..693ccf4 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,7 +247,7 @@ call_debbindiff() {
( timeout $TIMEOUT schroot \
--directory $TMPDIR \
-c source:jenkins-reproducible-${DBDSUITE}-debbindiff \
- debbindiff -- \
+ TMPDIR=$TEMP debbindiff -- \
--html ./${DBDREPORT} \
./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 \
@@ -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
More information about the Qa-jenkins-scm
mailing list