[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "reproducible: run debbindiff in utf8 environment (workaround related to #778641 and #780863)"
Holger Levsen
holger at moszumanska.debian.org
Mon Mar 23 21:51:47 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 bddd19a1367d6f8efb6dff8eb20111fa0c31ad5c
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Mar 23 22:51:35 2015 +0100
Revert "reproducible: run debbindiff in utf8 environment (workaround related to #778641 and #780863)"
This reverts commit 375e2c3374ef1a6215794dc8d85b1169d93eb929.
---
bin/reproducible_build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index c78b238..2b94ae3 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
--
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