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

    p.conf: set known-problem-directory
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5e39c0d..7153fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * piuparts.conf:
     - New global settings:
       + slave-directory
+      + known-problem-directory (for known_problem definitions)
       + 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.
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index b7d6c16..e50fa1f 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -27,6 +27,7 @@ PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.
 master-directory = /org/piuparts.debian.org/master
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs
+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 = /
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index dae7c8e..3336204 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -29,6 +29,7 @@ PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.
 master-directory = /org/piuparts.debian.org/master
 slave-directory = /org/piuparts.debian.org/slave
 output-directory = /org/piuparts.debian.org/htdocs
+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 = /
diff --git a/master-bin/detect_well_known_errors.in b/master-bin/detect_well_known_errors.in
index 5dd01c4..5aa7c39 100755
--- a/master-bin/detect_well_known_errors.in
+++ b/master-bin/detect_well_known_errors.in
@@ -27,9 +27,9 @@
 get_config_value MASTER global master-directory
 get_config_value SECTIONS global sections
 get_config_value HTDOCS global output-directory
+get_config_value PROBLEMDIR global known-problem-directory @sharedir@/piuparts/known_problems
 
 
-PROBLEMDIR=@sharedir@/piuparts/known_problems
 PROBLEMS=$(ls $PROBLEMDIR)
 OLDPWD=$(pwd)
 

-- 
piuparts git repository