[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-94-g72ae6d0

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 4296ce69171ff57f4b4176c77f5c38fe4bb3e112
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 14:02:52 2013 +0100

    make tmpdir setting mandatory for master/slave operation
    
    use /var/cache/piuparts/tmp for the piuparts-slave package
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 748fbcb..181721a 100644
--- a/README.txt
+++ b/README.txt
@@ -534,11 +534,11 @@ section, too, and will serve as defaults for all other sections
  contain the section-specific flags.
 
 * "tmpdir" is the scratch area where piuparts will create the
- chroots. Note: the filesystem where this is located may not be
- mounted with the nodev or nosuid options. The default is
- "/tmp/piuparts". The scripts that are monitoring this directory
- for leftover mountpoints and chroots only evaluate the [global]
- setting.
+ chroots. Note: the filesystem where this is located must not be
+ mounted with the nodev or nosuid options. This is a mandatory
+ setting with no default. The scripts that are monitoring this
+ directory for leftover mountpoints and chroots only evaluate the
+ [global] setting.
 
 * "mirror" tells the slave which mirror it is to use. The slave
  gives this to piuparts when it runs it. The URLs for Packages and
diff --git a/TODO b/TODO
index 1df4cca..1456b40 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,7 @@ wishlist!
 for 0.50:
 
 - make piuparts-master + piuparts-slave packages work out-of-the-box:
+  * piuparts-slave.postrm purge: clean up /var/cache/piuparts/tmp/
   - conf/piuparts.sudoers should be split for master+slave packages.
   - ship sane minimal sudoers in p-s.deb than can be enabled by default do we
     really need anything else than running piuparts and piuparts_slave_*
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 99d8837..fde1b91 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -20,7 +20,7 @@ output-directory = /var/lib/piuparts/htdocs
 doc-root = /piuparts/
 master-command = python /usr/share/piuparts/piuparts-master
 piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
-tmpdir = /var/tmp
+tmpdir = /var/cache/piuparts/tmp
 idle-sleep = 300
 max-tgz-age = 604800
 expire-old-days = 120
diff --git a/debian/changelog b/debian/changelog
index fc959c0..4921210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - New global settings:
       + slave-directory
       + backup-directory (for the master script prepare_backup)
+    - Setting tmpdir is now mandatory for master/slave operation.
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
     - Add Package.waiting_count() and friends, populated in calc_rrdep_count.
@@ -47,6 +48,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * prepare_backup:
     - Get paths from piuparts.conf.
     - Prepare a copy of submissions.txt, too.
+  * piuparts-slave.deb: Use /var/cache/piuparts/tmp as tmpdir.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.
diff --git a/debian/piuparts-slave.dirs b/debian/piuparts-slave.dirs
index 3916802..9f10c46 100644
--- a/debian/piuparts-slave.dirs
+++ b/debian/piuparts-slave.dirs
@@ -1 +1,2 @@
 var/lib/piuparts
+var/cache/piuparts/tmp
diff --git a/piuparts-slave.py b/piuparts-slave.py
index f568bc6..f8a724b 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -79,7 +79,7 @@ class Config(piupartslib.conf.Config):
                 "mirror": None,
                 "piuparts-command": "sudo piuparts",
                 "piuparts-flags": "",
-                "tmpdir": "/tmp/piuparts",
+                "tmpdir": None,
                 "distro": None,
                 "area": None,
                 "chroot-tgz": None,
diff --git a/slave-bin/detect_leftover_processes.in b/slave-bin/detect_leftover_processes.in
index 8a280b2..72e8696 100755
--- a/slave-bin/detect_leftover_processes.in
+++ b/slave-bin/detect_leftover_processes.in
@@ -38,7 +38,7 @@ file_age()
 }
 
 get_config_value SLAVEROOT global slave-directory
-get_config_value PIUPARTS_TMPDIR global tmpdir /org/piuparts.debian.org/tmp
+get_config_value PIUPARTS_TMPDIR global tmpdir
 
 
 STATEFILE=$SLAVEROOT/leftover_processes
diff --git a/slave-bin/detect_tmp_cruft.in b/slave-bin/detect_tmp_cruft.in
index 149d6a0..47589b4 100755
--- a/slave-bin/detect_tmp_cruft.in
+++ b/slave-bin/detect_tmp_cruft.in
@@ -24,7 +24,7 @@ set -e
 
 . @sharedir@/piuparts/lib/read_config.sh
 
-get_config_value PIUPARTS_TMPDIR global tmpdir /org/piuparts.debian.org/tmp
+get_config_value PIUPARTS_TMPDIR global tmpdir
 
 
 MOUNTS="$(mktemp)"
diff --git a/slave-bin/slave_cleanup.in b/slave-bin/slave_cleanup.in
index 133abcd..dce534d 100755
--- a/slave-bin/slave_cleanup.in
+++ b/slave-bin/slave_cleanup.in
@@ -26,7 +26,7 @@ set -e
 
 . @sharedir@/piuparts/lib/read_config.sh
 
-get_config_value PIUPARTS_TMPDIR global tmpdir /org/piuparts.debian.org/tmp
+get_config_value PIUPARTS_TMPDIR global tmpdir
 
 
 # do nothing if piuparts-slave is running

-- 
piuparts git repository