From 1139a3ff330b75875e20382b750628e405b9c976 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 1 Sep 2015 15:36:35 +0200 Subject: reproducible: now that diffoscope is available in testing, rename schroots everywhere and always use diffoscope --- bin/reproducible_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/reproducible_build.sh') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 5bf21dc8..174b7570 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -282,19 +282,19 @@ call_diffoscope_on_changes_files() { local TIMEOUT="30m" DBDSUITE=$SUITE if [ "$SUITE" = "experimental" ] ; then - # there is no extra debbindiff-schroot for experimental because we specical case ghc enough already ;) + # there is no extra diffoscope-schroot for experimental because we specical case ghc enough already ;) 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) - DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)" + DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)" echo "$(date) - $DIFFOSCOPE will be used to compare the two builds:" | tee -a ${RBUILDLOG} set +e set -x ( timeout $TIMEOUT schroot \ --directory $TMPDIR \ - -c source:jenkins-reproducible-${DBDSUITE}-debbindiff \ - -- sh -c "export TMPDIR=$TEMP ; debbindiff \ + -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \ + -- sh -c "export TMPDIR=$TEMP ; diffoscope \ --html $TMPDIR/${DBDREPORT} \ --text $TMPDIR/$DBDTXT \ $TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \ -- cgit v1.2.3-54-g00ecf