[Qa-jenkins-scm] [jenkins.debian.net] 02/03: reproducible: run debbindiff against .changes files in current directory (see #764459)

[Holger Levsen]

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 47e0d1283cce6679336c29c2931f0800d8bc5fa0
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Mar 10 03:15:13 2015 +0100

    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 5bbbcbe..f90b304 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 5a1df62..8a3782b 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git