[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-30-gbd8fd0e

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit bd8fd0e9fef85b8167f6d164eee6b014b23f51fd
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Jan 20 20:07:45 2013 +0100

    p.conf: new global config setting: slave-directory
    
    to be used for the scripts controlling the slave,
    not from within piuparts-slave (which uses PWD)
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index 38badd6..ba97216 100644
--- a/README.txt
+++ b/README.txt
@@ -471,6 +471,9 @@ used for all further sections.
 * "master-directory" is the directory where the master keeps its
  files. Can be relative to the master's home directory.
 
+* "slave-directory" is the directory where the slave keeps its
+ files. Can be relative to the slave's home directory.
+
 * "output-directory" is the directory where piuparts-report places
  the logfiles, generated html files, charts, ... that can be
  served by a webserver.
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index f41fe36..99d8837 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -15,6 +15,7 @@ sections = sid
 master-host = localhost
 master-user = piupartsm
 master-directory = /var/lib/piuparts/master
+slave-directory = /var/lib/piuparts/slave
 output-directory = /var/lib/piuparts/htdocs
 doc-root = /piuparts/
 master-command = python /usr/share/piuparts/piuparts-master
diff --git a/debian/changelog b/debian/changelog
index 2d8ff5d..f07e5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Call dpkg-deb with --nocheck to allow bad version numbers.
     - Pass unqualified package names to apt-cache show for lenny support.
   * piuparts.conf:
+    - New global setting slave-directory.
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
   * piuparts-master.py:
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index f902c36..2ecfb7c 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -12,6 +12,7 @@ master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
+slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/
 doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index dd8bd1f..f41ac5b 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -11,6 +11,7 @@ master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-directory = /org/piuparts.debian.org/master/
+slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/
 doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master

-- 
piuparts git repository