[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: don't generate pkg.html wrongly if a package hasnt been built yet

Holger Levsen holger at layer-acht.org
Fri Dec 8 10:24: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 5dc25fe223e37742e256af861188c1549882cf9f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 8 10:24:40 2017 +0000

    reproducible Arch Linux: don't generate pkg.html wrongly if a package hasnt been built yet
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_archlinux.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index a9f9d8a..272ecf5 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -53,9 +53,6 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 			continue
 		fi
 		if [ ! -f $ARCHLINUX_PKG_PATH/pkg.state ] ; then
-			echo "     <tr>" >> $HTML_BUFFER
-			echo "      <td>$REPOSITORY</td>" >> $HTML_BUFFER
-			echo "      <td>$PKG</td>" >> $HTML_BUFFER
 			if [ -f $ARCHLINUX_PKG_PATH/pkg.version ] ; then
 				VERSION=$(cat $ARCHLINUX_PKG_PATH/pkg.version)
 			elif [ -f $ARCHLINUX_PKG_PATH/build1.version ] ; then
@@ -77,11 +74,15 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 			else
 				echo "$(date -u )   - cannot determine state of $PKG from '$REPOSITORY', please check $ARCHLINUX_PKG_PATH yourself."
 				continue
-				#VERSION="undetermined"
+				VERSION="undetermined"
+			fi
+			if [ "$VERSION" != "undetermined" ] ; then
+				echo $VERSION > $ARCHLINUX_PKG_PATH/pkg.version
 			fi
+			echo "     <tr>" >> $HTML_BUFFER
+			echo "      <td>$REPOSITORY</td>" >> $HTML_BUFFER
+			echo "      <td>$PKG</td>" >> $HTML_BUFFER
 			echo "      <td>$VERSION</td>" >> $HTML_BUFFER
-			echo $VERSION > $ARCHLINUX_PKG_PATH/pkg.version
-
 			echo "      <td>" >> $HTML_BUFFER
 			#
 			#

-- 
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