[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: build.sh: now that diffoscope can, make diffoscope compare the .buildinfo files instead of the .changes, to avoid having double differences

[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 c8503b78e7a1b41dc371dc3f82d2cedad59bf33a
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Feb 7 14:52:52 2016 +0000

    reproducible: build.sh: now that diffoscope can, make diffoscope compare the .buildinfo files instead of the .changes, to avoid having double differences
---
 bin/reproducible_build.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 92e1c89..4d5dd4b 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -321,7 +321,7 @@ dbd_timeout() {
 	handle_ftbr "$msg"
 }
 
-call_diffoscope_on_changes_files() {
+call_diffoscope_on_buildinfo_files() {
 	local TMPLOG=$(mktemp --tmpdir=$TMPDIR)
 	echo | tee -a ${RBUILDLOG}
 	local TIMEOUT="120m"
@@ -350,8 +350,8 @@ call_diffoscope_on_changes_files() {
 		-- sh -c "export TMPDIR=$TEMP ; diffoscope \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
-			$TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
-			$TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes" \
+			$TMPDIR/b1/${BUILDINFO} \
+			$TMPDIR/b2/${BUILDINFO}" \
 	2>&1 ) >> $TMPLOG
 	RESULT=$?
 	LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG || true)
@@ -366,8 +366,8 @@ call_diffoscope_on_changes_files() {
 			-- sh -c "export TMPDIR=$TEMP ; diffoscope \
 				--html $TMPDIR/${DBDREPORT} \
 				--text $TMPDIR/$DBDTXT \
-				$TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes \
-				$TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes" \
+				$TMPDIR/b1/${BUILDINFO} \
+				$TMPDIR/b2/${BUILDINFO}" \
 		2>&1 ) >> $TMPLOG
 		RESULT=$?
 	fi
@@ -794,7 +794,7 @@ update_rbuildlog
 if [ $FTBFS -eq 1 ] ; then
 	handle_ftbfs
 elif [ $FTBFS -eq 0 ] ; then
-	call_diffoscope_on_changes_files  # defines DIFFOSCOPE, update_db_and_html defines STATUS
+	call_diffoscope_on_buildinfo_files  # defines DIFFOSCOPE, update_db_and_html defines STATUS
 fi
 print_out_duration
 

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