[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: improve code to check whether a schroot is in use

[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 5a487053f92e45622e0ec4c48e9346de445ae0a4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Sep 22 20:19:27 2015 +0200

    reproducible: improve code to check whether a schroot is in use
---
 bin/reproducible_maintenance.sh | 2 +-
 bin/schroot-create.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index d466d2e..c4ec831 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -114,7 +114,7 @@ fi
 
 # remove old and unused schroot sessions
 echo "$(date -u) - Removing unused schroot sessions."
-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
+ps fax|grep -v grep |grep "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep "schroot --directory" || schroot -e -c $i ; done
 # to explain this:
 # first, check if no process using "schroot" is running...
 # then loop through all schroot sessions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 0f666ab..d0deea9 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -186,7 +186,7 @@ cleanup_schroot_sessions() {
 	# FIXME: if this works well, move to _common.sh and use the same function from _maintenance.sh
 	local RESULT=""
 	for loop in $(seq 0 40) ; do
-		ps fax|grep -v grep | grep -v schroot-create.sh |grep schroot || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep -v schroot-create.sh | grep schroot || schroot -e -c $i ; done
+		ps fax|grep -v grep | grep -v schroot-create.sh |grep "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep -v schroot-create.sh | grep "schroot --directory" || schroot -e -c $i ; done
 		RESULT=$(schroot --all-sessions -l)
 		if [ -z "$RESULT" ] ; then
 			echo "No schroot sessions in use atm..."

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