[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-105-gac1319a

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 6b7bdef6ef23afbd99d8229604701370768f870f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 19:08:03 2013 +0100

    use screen -ls to check for running screens
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 49e4763..cdcacb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,7 +65,8 @@ piuparts (0.50) UNRELEASED; urgency=low
   * pre_remove_50_find_missing_copyright: Add some exceptions.
   * Add several exceptions for lenny and lenny2squeeze tests.
   * slave_{run,join}: Rename the screen session to "piuparts_slave_screen".
-  * slave_{run,join,cleanup}: Use pgrep to find running processes.
+  * slave_cleanup: Use pgrep to find running piuparts-slave processes.
+  * slave_{run,join}: Use screen -ls to find running screen sessions.
   * detect_leftover_processes: Move statefile to slave-directory.
   * detect_stale_mounts: Merge into detect_tmp_cruft.
   * detect_tmp_cruft: Move to slave-bin and run from slave crontab.
diff --git a/slave-bin/slave_join b/slave-bin/slave_join
index 28d0d5a..ef0455f 100755
--- a/slave-bin/slave_join
+++ b/slave-bin/slave_join
@@ -23,11 +23,15 @@ set -e
 
 SESSIONNAME=piuparts_slave_screen
 
-if pgrep -f "SCREEN.*$SESSIONNAME" >/dev/null ; then
-  screen -R -S $SESSIONNAME
-else
+if screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
   echo "piuparts-slave not running!"
   echo
   echo "ps faxu | grep piuparts"
   ps faxu | grep piuparts
+  echo
+  echo "screen -ls"
+  screen -ls
+  exit 1
 fi
+
+screen -R -S $SESSIONNAME
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index f2b2a02..de3e26c 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -32,9 +32,11 @@ export PYTHONPATH
 SESSIONNAME=piuparts_slave_screen
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
 
-if pgrep -f share/piuparts/piuparts-slave ; then
-	# slave is running
-	exit 0
+if ! screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
+	echo "piuparts-slave is already running!"
+	echo
+	screen -ls
+	exit 1
 fi
 
 cd /org/piuparts.debian.org/slave

-- 
piuparts git repository