[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-76-g38f136c

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 38f136cb77e85e89b69d678ec9c3d1cac40f3f4d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jul 26 16:40:43 2012 +0200

    slave-join: fix bug preventing detection that the slave is not running.

diff --git a/debian/changelog b/debian/changelog
index 8b216f0..44e95ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ piuparts (0.46) UNRELEASED; urgency=low
 
   [ Holger Levsen ]
   * piuparts-report: drop in-code index.tpl stub.
+  * slave-join: fix bug preventing detection that the slave is not running.
 
   [ Andreas Beckmann ]
   * piuparts.py:
diff --git a/slave-bin/slave_join b/slave-bin/slave_join
index 26f47f6..d3bffa1 100755
--- a/slave-bin/slave_join
+++ b/slave-bin/slave_join
@@ -23,7 +23,7 @@ set -e
 
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
 
-if [ -f $SCREENLOG ] ; then
+if [ $(ps fax|grep piuparts-slave|grep -v grep |wc -l) = 0 ] ; then
   screen -R -S piuparts-slave-screen
 else
   echo "$SCREENLOG does not exist, slave not running!"

-- 
piuparts git repository