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

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit df5a7e2316ae6fa317f3b94596c64b5b0d9502ac
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Mar 9 16:44:13 2013 +0100

    p.conf: use simple master-command
    
    PYTHONPATH is now handled by the piuparts-master wrapper script
    
    running piuparts from git cannot easily restrict the command to be run via
    authorized_keys
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index cd624e8..cf8c109 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -55,6 +55,7 @@ mirror = http://ftp.de.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
+master-command = /org/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command =
 	sudo
 	env PYTHONPATH=%(PYTHONPATH)s
@@ -69,7 +70,6 @@ known-problem-directory = /org/piuparts.debian.org/share/piuparts/known_problems
 backup-directory = /org/piuparts.debian.org/backup
 tmpdir = /org/piuparts.debian.org/tmp
 doc-root = /
-master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages /org/piuparts.debian.org/share/piuparts/piuparts-master
 # this value is too high for production (it will cause piuparts-slave to sleep
 # for a whole day) but useful for testing master-slave mode, for running on a
 # test system 24/7 without causing load for 24/7
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index 0d71bb2..b916ce6 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -74,6 +74,7 @@ mirror = http://piatti.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
+master-command = /org/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command =
 	sudo
 	env PYTHONPATH=%(PYTHONPATH)s
@@ -88,7 +89,6 @@ known-problem-directory = /org/piuparts.debian.org/share/piuparts/known_problems
 backup-directory = /org/piuparts.debian.org/backup
 tmpdir = /org/piuparts.debian.org/tmp
 doc-root = /
-master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages /org/piuparts.debian.org/share/piuparts/piuparts-master
 # 30*60
 idle-sleep = 1800
 max-tgz-age = 0

-- 
piuparts git repository