diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-06-18 00:58:36 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-06-18 00:58:36 +0200 |
| commit | 75ade76a6ca4c73cf4b7d3de06358d64d54510c0 (patch) | |
| tree | 73e9dd2eb182dff606fe9533d297b47bdf76cd85 | |
| parent | 4ed8e3b32152f9a85a83ad1efd2fda1c6eb11743 (diff) | |
| download | jenkins.debian.net-75ade76a6ca4c73cf4b7d3de06358d64d54510c0.tar.xz | |
Revert "reproducible: build: try harder to get debbindiff saving files in a defined temporary directory"
This reverts commit 4ed8e3b32152f9a85a83ad1efd2fda1c6eb11743.
| -rwxr-xr-x | bin/reproducible_build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 693ccf49..38abb2d4 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 - local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX) + export 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 \ - TMPDIR=$TEMP debbindiff -- \ + debbindiff -- \ --html ./${DBDREPORT} \ ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \ ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 \ @@ -262,6 +262,7 @@ 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 |