[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.47-40-g31a624f

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit fad5de39fda7fee8ae55816c86112057688072a0
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Oct 5 21:14:39 2012 +0200

    p-s: add + use [global] tmpdir config option
    
    only specify the tmpdir once and use it for the scripts, too (later)
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 88aba98..f41fe36 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -18,7 +18,8 @@ master-directory = /var/lib/piuparts/master
 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
+piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
+tmpdir = /var/tmp
 idle-sleep = 300
 max-tgz-age = 604800
 expire-old-days = 120
diff --git a/debian/changelog b/debian/changelog
index fe5cacc..4cac6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,7 @@ piuparts (0.48) UNRELEASED; urgency=low
   * piuparts-slave.py:
     - Retry sections with higher precedence more often.
     - Construct the piuparts command line from the new config options
-      piuparts-command and piuparts-flags.
+      piuparts-command, piuparts-flags, and tmpdir.
   * piuparts-report.py:
     - Don't hardcode section names, always show all known_problem reports.
   * detect_piuparts_issues: Catch the chroot running out of space.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index b3974ef..104d32c 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -80,6 +80,7 @@ class Config(piupartslib.conf.Config):
                 "mirror": None,
                 "piuparts-command": "sudo piuparts",
                 "piuparts-flags": "",
+                "tmpdir": "/tmp/piuparts",
                 "distro": None,
                 "area": None,
                 "chroot-tgz": None,
@@ -656,6 +657,8 @@ def test_package(config, package, packages_files):
         base_command.extend(config["piuparts-flags"].split())
     if config["mirror"]:
         base_command.extend(["--mirror", config["mirror"]])
+    if config["tmpdir"]:
+        base_command.extend(["--tmpdir", config["tmpdir"]])
 
     ret = 0
     if config["chroot-tgz"]:
@@ -721,6 +724,8 @@ def create_chroot(config, tarball, distro):
         command.extend(config["piuparts-flags"].split())
     if config["mirror"]:
         command.extend(["--mirror", config["mirror"]])
+    if config["tmpdir"]:
+        command.extend(["--tmpdir", config["tmpdir"]])
     command.extend(["-d", distro])
     command.extend(["-s", tarball + ".new"])
     command.extend(["--apt", "dpkg"])

-- 
piuparts git repository