[Qa-jenkins-scm] [jenkins.debian.net] 01/01: fixup ee0eaca9: reproducible Arch Linux: record version being built and include prefer this when later determining version

Holger Levsen holger at layer-acht.org
Thu Nov 30 21:53:53 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 94f2cacff71aa836b19bd5bb8aadb0c6a9cf4e99
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Nov 30 21:53:38 2017 +0000

    fixup ee0eaca9: reproducible Arch Linux: record version being built and include prefer this when later determining version
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_archlinux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 53791db..a52b798 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -57,11 +57,11 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 			echo "      <td>$REPOSITORY</td>" >> $HTML_BUFFER
 			echo "      <td>$PKG</td>" >> $HTML_BUFFER
 			if [ -f $ARCHLINUX_PKG_PATH/build1.version ] ; then
-				VERSION=$($ARCHLINUX_PKG_PATH/build1.version)
+				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
 						irc_message archlinux-reproducible "$ARCHLINUX_PKG_PATH/build1.version and $ARCHLINUX_PKG_PATH/build2.version differ, this should not happen. Please tell h01ger."
-						VERSION="$VERSION or $($ARCHLINUX_PKG_PATH/build2.version)"
+						VERSION="$VERSION or $(cat $ARCHLINUX_PKG_PATH/build2.version)"
 					fi
 				fi
 			elif [ $(ls $ARCHLINUX_PKG_PATH/*.pkg.tar.xz.html 2>/dev/null | wc -l) -eq 1 ] ; then

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