[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 1dacb5c39ef730b1d6126733ab1183f0e2a10a80
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Feb 25 03:01:09 2013 +0100

    slave_run: use piuparts.conf to get paths etc.
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index d462230..1cc794a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * slave_{run,join}: Use screen -ls to find running screen sessions.
   * slave_join: Use 'script /dev/null' hack if needed to get a writable tty.
     This avoids running the piuparts-slave screen session as root.
+  * slave_run: Get paths etc. from piuparts.conf.
   * 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_run.in b/slave-bin/slave_run.in
index de3e26c..65d5062 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -25,12 +25,13 @@ set -e
 . @sharedir@/piuparts/lib/read_config.sh
 
 get_config_value PYTHONPATH global PYTHONPATH ''
+get_config_value SLAVEROOT global slave-directory
 
 
 export PYTHONPATH
 
 SESSIONNAME=piuparts_slave_screen
-SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
+SCREENLOG=$SLAVEROOT/screenlog.0
 
 if ! screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
 	echo "piuparts-slave is already running!"
@@ -39,8 +40,10 @@ if ! screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
 	exit 1
 fi
 
-cd /org/piuparts.debian.org/slave
-rm -f $SCREENLOG					# used by ~piupartsm/bin/detect_slave_problems
+mkdir -p $SLAVEROOT
+cd $SLAVEROOT
+
+rm -f $SCREENLOG
 
 trap "cat $SCREENLOG | mail -s 'slave abnormaly ended' piupartsm ; rm $SCREENLOG; exit" TERM EXIT
 screen -L -d -m -S $SESSIONNAME @sharedir@/piuparts/piuparts-slave

-- 
piuparts git repository