[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian live: properly deal with files which might not exist

[Holger Levsen (@holger)]

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


Commits:
c8e58934 by Holger Levsen at 2022-09-16T13:34:41+02:00
reproducible Debian live: properly deal with files which might not exist

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

- - - - -


1 changed file:

- bin/reproducible_debian_live_build.sh


Changes:

=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -34,13 +34,10 @@ cleanup() {
 	local RESULT=$1
 	output_echo "Publishing results."
 
-	# Remove previously published files
-	# Ignore the error code, because the file might not be present
-	set +e
-	publish_file delete ISOfile ${DESKTOP}-${SUITE}.iso
-	publish_file delete Summary ${DESKTOP}-${SUITE}.txt
-	publish_file delete DiffoscopeOutput ${DESKTOP}-${SUITE}.html
-	set -e
+	# Remove previously published files if they exist
+	[ ! -f ${DESKTOP}-${SUITE}.iso ] || publish_file delete ISOfile ${DESKTOP}-${SUITE}.iso
+	[ ! -f ${DESKTOP}-${SUITE}.txt ] || publish_file delete Summary ${DESKTOP}-${SUITE}.txt
+	[ ! -f ${DESKTOP}-${SUITE}.html ] || publish_file delete DiffoscopeOutput ${DESKTOP}-${SUITE}.html
 
 	if [ "${RESULT}" == "success" ]; then
 		output_echo "Info: no differences found."



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c8e58934fe3a0a7370cc23e74270646f7811c022
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/20220916/3548d019/attachment-0001.htm>