[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fixup 53b6a71a47

Holger Levsen holger at moszumanska.debian.org
Mon Jun 1 17:18:10 UTC 2015


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 033d1037f098dcfc31bdf6042368b936bd67829e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 1 19:18:02 2015 +0200

    reproducible: fixup 53b6a71a47
---
 bin/reproducible_build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 014a8af..88064b6 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -266,9 +266,10 @@ check_buildinfo() {
 	grep-dctrl -s Build-Environment -n ${SRCPACKAGE} ./b1/$BUILDINFO > $TMPFILE1
 	grep-dctrl -s Build-Environment -n ${SRCPACKAGE} ./b2/$BUILDINFO > $TMPFILE2
 	set +e
-	RESULT=$(diff $TMPFILE1 $TMPFILE2)
-	rm $TMPFILE1 $TMPFILE2
+	diff $TMPFILE1 $TMPFILE2
+	RESULT=$?
 	set -e
+	rm $TMPFILE1 $TMPFILE2
 	if [ $RESULT -eq 1 ] ; then
 		irc_message "$BUILDINFO varies, probably due to mirror update. Please investigate ${BUILD_URL} and make reproducible_build.sh deal properly with this."
 	fi

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



More information about the Qa-jenkins-scm mailing list