[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.49-194-g6f9dd07

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 34c4c59aa9fe7d1de16c6b8b011e56e10951655a
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 10 10:11:59 2013 +0100

    master-command: drop explicit python
    
    piuparts-master is executable and has a correct hashbang
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 375035b..99562e7 100644
--- a/README.txt
+++ b/README.txt
@@ -517,8 +517,7 @@ section, too, and will serve as defaults for all other sections
 
 * "master-command" is the command to run on master-host to start
  the master. When the master has been installed from the Debian
- package, the command is
- 'python /usr/share/piuparts/piuparts-master'.
+ package, the command is '/usr/share/piuparts/piuparts-master'.
  The section name will be given as a command line argument to this
  command.
 
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 183d0a4..906ab84 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -9,7 +9,7 @@
 sections = sid
 master-host = localhost
 master-user = piupartsm
-master-command = python /usr/share/piuparts/piuparts-master
+master-command = /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
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index b38bab4..73fe8c7 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -58,7 +58,7 @@ 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 python /org/piuparts.debian.org/share/piuparts/piuparts-master
+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 1a166ad..6c9e830 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -77,7 +77,7 @@ 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 python /org/piuparts.debian.org/share/piuparts/piuparts-master
+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