[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 d78bddf83992b89d19460b2d5418952a6c8ad8ae
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 14:49:08 2013 +0100

    master-bin/slave-bin: get PYTHONPATH from piuparts.conf
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 271e5e0..cfdcc13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * prepare_backup:
     - Get paths from piuparts.conf.
     - Prepare a copy of submissions.txt, too.
+  * master-bin/slave-bin: Use PYTHONPATH from piuparts.conf.
   * piuparts-slave.deb: Use /var/cache/piuparts/tmp as tmpdir.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
diff --git a/master-bin/generate_daily_report.in b/master-bin/generate_daily_report.in
index 53f936b..5159713 100755
--- a/master-bin/generate_daily_report.in
+++ b/master-bin/generate_daily_report.in
@@ -23,10 +23,10 @@ get_config_value MASTER global master-directory
 get_config_value SECTIONS global sections
 get_config_value HTDOCS global output-directory
 get_config_value URLBASE global urlbase http://piuparts.debian.org
-get_config_value PIUPARTS_PREFIX global prefix /org/piuparts.debian.org
+get_config_value PYTHONPATH global PYTHONPATH ''
 
 
-export PYTHONPATH=$PIUPARTS_PREFIX/lib/python2.6/dist-packages:$PIUPARTS_PREFIX/lib/python2.7/dist-packages
+export PYTHONPATH
 
 LOCKFILE=$HTDOCS/daily.lock
 if [ -e $LOCKFILE ]; then
diff --git a/master-bin/report_newly_bugged_packages.in b/master-bin/report_newly_bugged_packages.in
index 8f457f9..4e5eef0 100755
--- a/master-bin/report_newly_bugged_packages.in
+++ b/master-bin/report_newly_bugged_packages.in
@@ -21,11 +21,11 @@
 
 get_config_value MASTER global master-directory
 get_config_value SECTIONS global sections
-get_config_value PIUPARTS_PREFIX global prefix /org/piuparts.debian.org
+get_config_value PYTHONPATH global PYTHONPATH ''
 get_config_value DEBEMAIL global bts-from
 
 
-export PYTHONPATH=$PIUPARTS_PREFIX/lib/python2.6/dist-packages:$PIUPARTS_PREFIX/lib/python2.7/dist-packages
+export PYTHONPATH
 
 OLDPWD=$(pwd)
 OUTPUT=$(mktemp)
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index 87ffe8f..ffdd8df 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -24,10 +24,13 @@ set -e
 
 . @sharedir@/piuparts/lib/read_config.sh
 
+get_config_value PYTHONPATH global PYTHONPATH ''
+
+
+export PYTHONPATH
 
 SESSIONNAME=piuparts_slave_screen
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
-export PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
 
 if pgrep -f share/piuparts/piuparts-slave ; then
 	# slave is running

-- 
piuparts git repository