From 47e0d1283cce6679336c29c2931f0800d8bc5fa0 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 10 Mar 2015 03:15:13 +0100 Subject: reproducible: run debbindiff against .changes files in current directory (see #764459) --- TODO | 1 - bin/reproducible_build.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TODO b/TODO index 5bbbcbed..f90b304a 100644 --- a/TODO +++ b/TODO @@ -116,7 +116,6 @@ properties: === reproducible -* run debbindiff against .changes files in current directory, instead of $LONGPATHES (due to #764459) * reproducible: dont delete userContent/$pkg on build begin.. * move all content into /var/lib/userContent/reproducible/ * more graphs diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 5a1df62f..8a3782bb 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -68,7 +68,7 @@ call_debbindiff() { touch $DBDCHROOT_READLOCK fi echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-sid-debbindiff debbindiff -- --version) will be used to compare the two builds now." | tee -a ${RBUILDLOG} - ( timeout 15m schroot --directory /tmp -c source:jenkins-reproducible-sid-debbindiff debbindiff -- --html $TMPDIR/${LOGFILE} $TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes $TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ) 2>&1 >> ${RBUILDLOG} + ( timeout 15m schroot --directory $TMPDIR -c source:jenkins-reproducible-sid-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ) 2>&1 >> ${RBUILDLOG} RESULT=$? set +x set -e -- cgit v1.2.3-70-g09d2