[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-94-g72ae6d0

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit f84d6b7c338fac448358bde54235b8b490883ffe
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 14:34:59 2013 +0100

    p.conf: add [global] PYTHONPATH setting
    
    for non-default installations that use piuparts from git
    in some other location than /usr
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 181721a..2ad88c3 100644
--- a/README.txt
+++ b/README.txt
@@ -612,6 +612,10 @@ configuration settings are used by the scripts in '~piuparts?/bin/'
 used to run piuparts.debian.org. They are all optional, default
 values are set in the scripts.
 
+* "PYTHONPATH" (global) sets the search path to the piupartslib
+ 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/ .
 
diff --git a/debian/changelog b/debian/changelog
index 4921210..271e5e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - New global settings:
       + slave-directory
       + backup-directory (for the master script prepare_backup)
+      + PYTHONPATH (to find the python modules in non-default path setups)
     - Setting tmpdir is now mandatory for master/slave operation.
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index b81161f..86910a3 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -11,6 +11,7 @@ sections = wheezy
 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
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index dd8b659..a0f3bf2 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -10,6 +10,7 @@ sections = sid testing2sid wheezy squeeze2wheezy squeeze lenny2squeeze
 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

-- 
piuparts git repository