[Qa-jenkins-scm] [jenkins.debian.net] 01/01: fixup 026431ca8: reproducible Arch Linux: only call diffoscope if artifacts are different

Tue Nov 21 22:50:47 UTC 2017

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 872a41ba79c358bc12fba8a7dff91320c4ebf43f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Nov 21 22:50:43 2017 +0000

    fixup 026431ca8: reproducible Arch Linux: only call diffoscope if artifacts are different
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 0d27efd..6635d1c 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -348,7 +348,7 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
 			echo "<html><body><p>$SRCPACKAGE/$ARTIFACT build reproducible in our test framework:<br />" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html
 			(cd $TMPDIR/b1/ ; sha256sum $SRCPACKAGE/$ARTIFACT >> $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html )
 			echo "</p></body>" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html
-		else
+		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] && [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then
 			# run diffoscope on the results
 			TIMEOUT="30m"
 			DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"

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

