[Qa-jenkins-scm] [jenkins.debian.net] 02/03: reproducible Arch Linux: read version if we have determined it already. now introduce 'undetermined' properly

[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 33088ec2be5ad731e54d4a3a2b8391940bb47d26
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Dec 2 21:28:07 2017 +0000

    reproducible Arch Linux: read version if we have determined it already. now introduce 'undetermined' properly
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_archlinux.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 7a39a6d..68146a5 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -56,11 +56,13 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 			echo "     <tr>" >> $HTML_BUFFER
 			echo "      <td>$REPOSITORY</td>" >> $HTML_BUFFER
 			echo "      <td>$PKG</td>" >> $HTML_BUFFER
-			if [ -f $ARCHLINUX_PKG_PATH/build1.version ] ; then
+			if [ -f $ARCHLINUX_PKG_PATH/pkg.version ] ; then
+				VERSION=$(cat $ARCHLINUX_PKG_PATH/pkg.version)
+			elif [ -f $ARCHLINUX_PKG_PATH/build1.version ] ; then
 				VERSION=$(cat $ARCHLINUX_PKG_PATH/build1.version)
 				if [ -f $ARCHLINUX_PKG_PATH/build2.log ] ; 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."
+						echo "$(date -u )   - $ARCHLINUX_PKG_PATH/build2.version does not exist, so the 2nd build fails. This happens."
 					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)"

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