[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Arch Linux: more changes to deal with new .pkg.tar.zst files

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
196f2f4b by Holger Levsen at 2020-09-10T18:07:39+02:00
reproducible Arch Linux: more changes to deal with new .pkg.tar.zst files

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_common.sh
=====================================
@@ -1052,7 +1052,8 @@ create_pkg_html() {
 	echo "      <td>" >> $HTML_BUFFER
 	#
 	#
-	if [ -z "$(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html 2>/dev/null)" ] ; then
+	# .zst is the new compressor, while .xz will eventually go away
+	if [ -z "$(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html *.pkg.tar.zst.html 2>/dev/null || true)" ] ; then
 		# this horrible if elif elif elif elif...  monster should be replaced
 		# by using pacman's exit code which is possible since sometime in 2018
 
@@ -1150,7 +1151,9 @@ create_pkg_html() {
 	else
 		local STATE=reproducible
 		local SOME_GOOD=false
-		for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do
+		# .zst is the new compressor, while .xz will eventually go away
+		for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html *.pkg.tar.zst.html || true) ; do
+			[ -f $ARTIFACT ] || continue
 			if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then
 				echo "deleting $ARTIFACT as version is not $VERSION"
 				rm -f $ARTIFACT



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/196f2f4b79c4f2e004061daed297d5a1a9a516d4

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/196f2f4b79c4f2e004061daed297d5a1a9a516d4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200910/a8652de5/attachment.html>