[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Arch Linux: drop debug code, cleanup cruft, exit on cleanup()

[Holger Levsen]

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


Commits:
d0fd4d07 by Holger Levsen at 2019-01-12T20:16:58Z
reproducible Arch Linux: drop debug code, cleanup cruft, exit on cleanup()

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

- - - - -


1 changed file:

- bin/reproducible_setup_archlinux_schroot.sh


Changes:

=====================================
bin/reproducible_setup_archlinux_schroot.sh
=====================================
@@ -34,6 +34,9 @@ bootstrap() {
 		exit 1
 	fi
 
+	if [ -f "archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz" ]; then
+		rm "archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz"
+	fi
 	if [ ! -f "archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz" ]; then
 		BOOTSTRAP_TAR_GZ="$BOOTSTRAP_DATE/archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz"
 		echo "$(date -u) - downloading Arch Linux bootstrap.tar.gz."
@@ -47,10 +50,6 @@ bootstrap() {
 		sudo rm -rf --one-file-system "$SCHROOT_BASE/$TARGET.old"
 
 		rm archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz
-	else
-		echo 'debug output:'
-		pwd
-		ls "archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz"
 	fi
 
 	# write the schroot config
@@ -73,6 +72,7 @@ cleanup() {
 		rm -rf --one-file-system $SCHROOT_TARGET || ( echo "Warning: $SCHROOT_TARGET could not be fully removed on forced cleanup." ; ls $SCHROOT_TARGET -la )
 	fi
 	rm -f $TMPLOG
+	exit 0
 }
 
 #SCHROOT_TARGET=$(mktemp -d -p $SCHROOT_BASE/ archlinuxrb-setup-$TARGET-XXXX)



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/d0fd4d07276c61e73706c5f87dfcf45c19e201eb
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/20190112/9ed133d3/attachment-0001.html>