[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-105-gac1319a

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 5556eb3f5694507b26d47878b52c5bddfc7b2a03
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 14:58:19 2013 +0100

    p.conf: get rid of [global] prefix setting
    
    obsoleted by PYTHONPATH setting and @sharedir@ substitution
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 2ad88c3..d3cf224 100644
--- a/README.txt
+++ b/README.txt
@@ -616,9 +616,6 @@ values are set in the scripts.
  python modules if they are not installed in their default location
  in /usr.
 
-* "prefix" (global) sets the prefix of the piuparts installation,
- e.g. for finding $prefix/share/piuparts/ .
-
 * "urlbase" (global) is the base url of the webserver serving this
  piuparts instance. Used to provide links to logfiles in email
  reports.
diff --git a/TODO b/TODO
index 1456b40..bd5ced8 100644
--- a/TODO
+++ b/TODO
@@ -15,7 +15,6 @@ for 0.50:
     as root?
   - verify that all scripts in $user/bin/ also work from master-slave packages
     eventually enable some conjobs in the packages
-  - remove references to /org/piuparts.debian.org from the stock packages
   - slave.postinst should setup ~piupartss/.ssh/known_hosts from /etc/ssh, even
     if only for localhost
   - slave.postinst should setup ~piupartsm/.ssh/authorized_keys using triggers
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 86910a3..6ecf775 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -12,7 +12,6 @@ master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
-prefix = /org/piuparts.debian.org
 master-directory = /org/piuparts.debian.org/master/
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index a0f3bf2..8a41f95 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -11,7 +11,6 @@ master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
-prefix = /org/piuparts.debian.org
 master-directory = /org/piuparts.debian.org/master/
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs/

-- 
piuparts git repository