[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-179-g4c57c95

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 609867595707fd0175af1a3763eb6a96630b3ad6
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Mar 8 15:19:25 2013 +0100

    p-s.deb: use basetgz-dir = /var/cache/piuparts/basetgz
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 143c354..183d0a4 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -13,6 +13,7 @@ master-command = python /usr/share/piuparts/piuparts-master
 piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
 master-directory = /var/lib/piuparts/master
 slave-directory = /var/lib/piuparts/slave
+basetgz-directory = /var/cache/piuparts/basetgz
 output-directory = /var/lib/piuparts/htdocs
 tmpdir = /var/cache/piuparts/tmp
 doc-root = /piuparts/
diff --git a/debian/changelog b/debian/changelog
index 78c6b70..f1c58b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,6 +94,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Prepare a copy of submissions.txt, too.
   * master-bin/slave-bin: Use PYTHONPATH from piuparts.conf.
   * piuparts-slave.deb: Use /var/cache/piuparts/tmp as tmpdir.
+    - Use /var/cache/piuparts/basetgz as basetgz-directory.
   * slave_{run,join}: Rename the screen session to "piuparts_slave_screen".
   * slave_cleanup: Use pgrep to find running piuparts-slave processes.
   * slave_{run,join}: Use screen -ls to find running screen sessions.
diff --git a/debian/piuparts-slave.dirs b/debian/piuparts-slave.dirs
index 9f10c46..b8ff774 100644
--- a/debian/piuparts-slave.dirs
+++ b/debian/piuparts-slave.dirs
@@ -1,2 +1,3 @@
 var/lib/piuparts
+var/cache/piuparts/basetgz
 var/cache/piuparts/tmp
diff --git a/debian/piuparts-slave.postinst b/debian/piuparts-slave.postinst
index 9d641f2..db5ade2 100644
--- a/debian/piuparts-slave.postinst
+++ b/debian/piuparts-slave.postinst
@@ -59,6 +59,8 @@ case "$1" in
     install -d -o $suser -g $pgroup -m 0755 $userhome/slave
     install -d -o $suser -g $pgroup -m 0755 $userhome/slave/0
 
+    chown $suser:$pgroup /var/cache/piuparts/basetgz
+
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/piuparts-slave.postrm b/debian/piuparts-slave.postrm
index 95086fc..249126e 100644
--- a/debian/piuparts-slave.postrm
+++ b/debian/piuparts-slave.postrm
@@ -19,6 +19,9 @@ case "$1" in
         rmdir /etc/piuparts || true
     fi
 
+    rm -rf /var/cache/piuparts/basetgz/*.log
+    rm -rf /var/cache/piuparts/basetgz/*.tar.gz
+
     ;;
   upgrade|remove|failed-upgrade|abort-install|abort-upgrade)
     ;;

-- 
piuparts git repository