diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-23 22:51:35 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-23 22:51:35 +0100 |
| commit | bddd19a1367d6f8efb6dff8eb20111fa0c31ad5c (patch) | |
| tree | 3f9f413592bc8c316083ec7c7e405f61b62819b6 | |
| parent | 3a641a5e1c79852b015153784f18ce3a008ea616 (diff) | |
| download | jenkins.debian.net-bddd19a1367d6f8efb6dff8eb20111fa0c31ad5c.tar.xz | |
Revert "reproducible: run debbindiff in utf8 environment (workaround related to #778641 and #780863)"
This reverts commit 375e2c3374ef1a6215794dc8d85b1169d93eb929.
| -rwxr-xr-x | bin/reproducible_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index c78b2380..2b94ae35 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -85,7 +85,7 @@ call_debbindiff() { fi echo | tee -a ${RBUILDLOG} echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --version 2>&1) will be used to compare the two builds now." | tee -a ${RBUILDLOG} - ( LC_CTYPE=C.UTF-8 timeout 15m schroot --directory $TMPDIR --preserve-environment -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 ) 2>&1 >> ${RBUILDLOG} + ( timeout 15m schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 ) 2>&1 >> ${RBUILDLOG} RESULT=$? set +x set -e |