reproducible: cleanup sessions more carefully

2 files changed, 10 insertions, 2 deletions

diff --git a/TODO b/TODO
index 2cd8d526..1c0ad1cb 100644
--- a/TODO
+++ b/TODO
@@ -171,6 +171,7 @@ properties:
 
 * higher prio:
 ** reproducible_build.sh changes needed:
+*** fix: "DIFFOSCOPE='E: Failed to change to directory ‘/tmp’: Permission denied" - maybe by making sure the cause is gone…
 *** handle_unhandled() needs to unregister the build from the db too
 *** rbuild.log isnt show when a package ftbfs
 *** diffoscope needs to be run on the target arch...
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 51859325..348842c6 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -183,8 +183,15 @@ bootstrap() {
 
 cleanup_schroot_sessions() {
 	# FIXME: if this works well, move to _common.sh and use the same function from _maintenance.sh
-	ps fax|grep -v grep |grep schroot || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || schroot -e -c $i ; done
-	schroot --all-sessions -l
+	local RESULT=""
+	for loop in $(seq 0 9) ; do
+		ps fax|grep -v grep |grep schroot || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || schroot -e -c $i ; done
+		RESULT=$(schroot --all-sessions -l)
+		if [ -z "$RESULT" ] ; then
+			break
+		fi
+		sleep 5
+	done
 }
 
 cleanup() {