[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-33-gcdb8f37

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5683fb43ee07c18d992ce41891863850f786b7ba
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Jan 20 20:21:51 2013 +0100

    slave_{run,join}: name the screen session "piuparts_slave_screen"
    
    intentionally does not include the substring "piuparts-slave"
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index f07e5c2..0ac8f51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * pre_remove_50_find_bad_permissions: Add some exceptions.
   * 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".
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 15 Jan 2013 11:51:43 +0100
 
diff --git a/slave-bin/slave_join b/slave-bin/slave_join
index 04c71cc..8eb5916 100755
--- a/slave-bin/slave_join
+++ b/slave-bin/slave_join
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # Copyright 2009-2010 Holger Levsen (holger at layer-acht.org)
 #
@@ -19,12 +20,11 @@
 #
 # reattach to an existing slave session
 #
-set -e
 
-SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
+SESSIONNAME=piuparts_slave_screen
 
 if [ $(ps fax|grep piuparts-slave|grep -v grep |wc -l) != 0 ] ; then
-  screen -R -S piuparts-slave-screen
+  screen -R -S $SESSIONNAME
 else
   echo "piuparts-slave not running!"
   echo
diff --git a/slave-bin/slave_run b/slave-bin/slave_run
index 92b6ba5..fb7e649 100755
--- a/slave-bin/slave_run
+++ b/slave-bin/slave_run
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # Copyright 2009-2011 Holger Levsen (holger at layer-acht.org)
 #
@@ -19,8 +20,8 @@
 #
 # run piuparts-slave in screen so that a screendump can be mailed via cron to monitor the slave
 #
-set -e
 
+SESSIONNAME=piuparts_slave_screen
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
 MONITORDIR=/org/piuparts.debian.org/master/monitor-slave
 export PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
@@ -31,7 +32,7 @@ rm -f $SCREENLOG					# used by ~piupartsm/bin/detect_slave_problems
 rm -f $MONITORDIR/*					# used by several scripts to only warn once a day
 
 trap "cat $SCREENLOG | mail -s 'slave abnormaly ended' piupartsm ; rm $SCREENLOG; exit" TERM EXIT
-screen -L -d -m -S piuparts-slave-screen su - piupartss -c "cd /org/piuparts.debian.org/slave && PYTHONPATH=$PYTHONPATH python ../share/piuparts/piuparts-slave"
+screen -L -d -m -S $SESSIONNAME su - piupartss -c "cd /org/piuparts.debian.org/slave && PYTHONPATH=$PYTHONPATH python ../share/piuparts/piuparts-slave"
 trap - TERM EXIT
 
 echo "piuparts-slave has been started."

-- 
piuparts git repository