From 2a046d8b431186b5171b1fca5acc6ea654fa1abc Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 30 Sep 2014 17:50:09 +0200
Subject: reproducible: use debbindiff instead of diffp to compare the two
 builds

---
 bin/reproducible_build.sh | 10 +++++-----
 bin/reproducible_stats.sh |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 7fee8499..c8bedafc 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -8,12 +8,12 @@ common_init "$@"
 
 # FIXME: needed as long as #763328 (RFP: /usr/bin/diffp) is unfixed...
 # fetch git repo for the diffp command used later
-if [ -d misc.git ] ; then
-	cd misc.git
+if [ -d debbindiff.git ] ; then
+	cd debbindiff.git
 	git pull
 	cd ..
 else
-	git clone git://git.debian.org/git/reproducible/misc.git misc.git
+	git clone git://git.debian.org/git/reproducible/debbindiff.git debbindiff.git
 fi
 
 # create dirs for results
@@ -182,8 +182,8 @@ for SRCPACKAGE in ${PACKAGES} ; do
 			set -e
 			cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes
 			LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc)
-			LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.log)
-			./misc.git/diffp b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes | tee ./results/${LOGFILE}
+			LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.html)
+			./debbindiff.git/debbindiff.py --html ./results/${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes
 			if ! $(grep -qv '^\*\*\*\*\*' ./results/${LOGFILE}) ; then
 				rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 
 				figlet ${SRCPACKAGE}
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh
index 8b57e340..ae8d9548 100755
--- a/bin/reproducible_stats.sh
+++ b/bin/reproducible_stats.sh
@@ -49,7 +49,11 @@ for PKG in $BAD ; do
 	VERSION=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"")
 	# remove epoch
 	VERSION=$(echo $VERSION | cut -d ":" -f2)
-	htmlecho "<a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.log\">$PKG </a> "
+	if [ -f "/var/lib/jenkins/userContent/diffp/${PKG}_${VERSION}.diffp.log" ] ; then
+		htmlecho "<a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.log\">$PKG </a> "
+	else
+		htmlecho "<a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.html\">$PKG </a> "
+	fi
 done
 htmlecho "</code></p>"
 htmlecho
-- 
cgit v1.2.3-70-g09d2