[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Holger Levsen]

The following commit has been merged in the master branch:
commit e5c508647c7be1b4b822553b80620e5bcaa05373
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Mar 25 13:38:58 2013 +0100

    slave_run: Run slave_cleanup before starting the slave.

diff --git a/TODO b/TODO
index f584f03..3df13cc 100644
--- a/TODO
+++ b/TODO
@@ -40,9 +40,6 @@ for 0.5x:
     existing data
 
 - sometimes a chroot doesn't get removed on piatti - find out why and fix it.
-- slave_run: cleanup stale proc mountpoints -> there is
-  ~piupartss/bin/slave_cleanup which should be executed at the beginning of
-  slave_run
 
 - handle .udebs more gracefully, see #699160 for details.
 
diff --git a/debian/changelog b/debian/changelog
index 07e3123..b5290a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ piuparts (0.51) UNRELEASED; urgency=low
   * piuparts.py:
     - Add to ignored_files:
       + /var/log/fontconfig.log (Closes: #703810) - Thanks to Hideki Yamane.
+  * slave_run:
+    - Run slave_cleanup before starting the slave.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
 
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index 7ac5497..4fec03c 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -41,14 +41,14 @@ if ! screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
 	exit 1
 fi
 
-# ensure the temporary directory exists
+# prepare environment
+rm -f $SCREENLOG
+ at sharedir@/piuparts/piuparts_cleanup
 mkdir -p $PIUPARTS_TMPDIR
-
 mkdir -p $SLAVEROOT
 cd $SLAVEROOT
 
-rm -f $SCREENLOG
-
+# finally, run piuparts-slave in screen
 screen -L -d -m -S $SESSIONNAME @sharedir@/piuparts/piuparts-slave
 
 echo "piuparts-slave has been started."

-- 
piuparts git repository