[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: filter Environment section from buildinfo files

[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 8b604b7baf65f4e407b54a29b3e1dc7dca138cef
Author: Reiner Herrmann <reiner at reiner-h.de>
Date:   Sun Nov 6 16:35:39 2016 +0100

    reproducible Debian: filter Environment section from buildinfo files
---
 bin/reproducible_build.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index f3e5bad..96f1148 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -743,6 +743,17 @@ remote_build() {
 	fi
 }
 
+filter_buildinfo_files() {
+	# filters out the Environment section from buildinfo files
+
+	local TMPFILE1=$(mktemp --tmpdir=$TMPDIR)
+	local TMPFILE2=$(mktemp --tmpdir=$TMPDIR)
+	grep-dctrl -I -s Environment . ./b1/$BUILDINFO > $TMPFILE1
+	grep-dctrl -I -s Environment . ./b2/$BUILDINFO > $TMPFILE2
+	mv $TMPFILE1 ./b1/$BUILDINFO
+	mv $TMPFILE2 ./b2/$BUILDINFO
+}
+
 check_buildinfo() {
 	local TMPFILE1=$(mktemp --tmpdir=$TMPDIR)
 	local TMPFILE2=$(mktemp --tmpdir=$TMPDIR)
@@ -905,6 +916,7 @@ update_rbuildlog
 if [ $FTBFS -eq 1 ] ; then
 	handle_ftbfs
 elif [ $FTBFS -eq 0 ] ; then
+	filter_buildinfo_files
 	call_diffoscope_on_buildinfo_files  # defines DIFFOSCOPE, update_db_and_html defines STATUS
 	share_buildinfo
 fi

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