[Qa-jenkins-scm] [jenkins.debian.net] 01/04: reproducible arch: cleanup schroot first

[Holger Levsen]

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 9d2bdd78a062c19dfd9072a1aa63f782425fbc92
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Oct 18 17:58:50 2015 +0200

    reproducible arch: cleanup schroot first
---
 bin/reproducible_build_arch_pkg.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index bfe3750..ed45880 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -14,18 +14,18 @@ set -e
 
 cleanup_all() {
 	cd
-	# delete main work dir (only on master)
-	if [ "$MODE" = "master" ] ; then
-		rm $TMPDIR -r
-		echo "$(date -u) - $TMPDIR deleted."
+	# delete session if it still exists
+	if [ "$MODE" != "master" ] ; then
+		schroot --end-session -c arch-$SRCPACKAGE-$(basename $TMPDIR) > /dev/null 2>&1 || true
 	fi
 	# delete makepkg build dir
 	if [ ! -z $SRCPACKAGE ] && [ -d /tmp/$SRCPACKAGE-$(basename $TMPDIR) ] ; then
 		rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)
 	fi
-	# delete session if it still exists
-	if [ "$MODE" != "master" ] ; then
-		schroot --end-session -c arch-$SRCPACKAGE-$(basename $TMPDIR) > /dev/null 2>&1 || true
+	# delete main work dir (only on master)
+	if [ "$MODE" = "master" ] ; then
+		rm $TMPDIR -r
+		echo "$(date -u) - $TMPDIR deleted."
 	fi
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git