[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: deal with missing build2.version

[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 0d38021aebf3c0c9f469daf1fed6b18bf9083ff5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Nov 30 23:18:39 2017 +0000

    reproducible Arch Linux: deal with missing build2.version
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_archlinux.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 5628d05..dddbde1 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -59,7 +59,9 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 			if [ -f $ARCHLINUX_PKG_PATH/build1.version ] ; then
 				VERSION=$(cat $ARCHLINUX_PKG_PATH/build1.version)
 				if [ -f $ARCHLINUX_PKG_PATH/build2.log ] ; then
-					if ! diff -q $ARCHLINUX_PKG_PATH/build1.version $ARCHLINUX_PKG_PATH/build2.version ; then
+					if [ ! -f $ARCHLINUX_PKG_PATH/build2.version ] ; then
+						echo "$(date -u )   - $ARCHLINUX_PKG_PATH/build2.version does not exist and should probably just be deleted. Please investigate."
+					elif [ ! diff -q $ARCHLINUX_PKG_PATH/build1.version $ARCHLINUX_PKG_PATH/build2.version ; then
 						echo "$(date -u )   - $ARCHLINUX_PKG_PATH/build1.version and $ARCHLINUX_PKG_PATH/build2.version differ, this should not happen. Please tell h01ger."
 						VERSION="$VERSION or $(cat $ARCHLINUX_PKG_PATH/build2.version)"
 					fi

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