[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.50-210-g09f9a90

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 93de1669bb625582620092979b3a7a3a41950c50
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue May 14 18:36:57 2013 +0200

    set defaults for known-problem-directory
    
    don't set known-problem-directory in piuparts.conf, there is
    not really a need to change this from the default currently
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 943e7b4..3ef0b17 100644
--- a/README.txt
+++ b/README.txt
@@ -657,6 +657,10 @@ section, too, and will serve as defaults for all other sections
  searched for dependencies that are not available in the current
  section if that describes a partial distro.
 
+* "known-problem-directory" is the path to the directory containing
+ definitions of known problems.
+ Default: "${prefix}/share/piuparts/known_problems"
+
 * "debug" tells the slave whether to log debug level messages. The
  value should be "yes" or "no", with the default being "no".
  piuparts itself currently always produces debug output and there
diff --git a/TODO b/TODO
index 718b69f..b3fbf99 100644
--- a/TODO
+++ b/TODO
@@ -40,9 +40,6 @@ for 0.5x:
 - look for a solution to use the global debian mirror for debian-backports,
   too, to avoid hardcoding a specific mirror in distros.conf
 
-- sane default for known-problem-directory setting, or define it in 
-  piuparts.conf.sample
-
 - maybe compress all logfiles
 
 - move counts.txt from htdocs to master
diff --git a/debian/changelog b/debian/changelog
index b0501de..7b642e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ piuparts (0.51) UNRELEASED; urgency=low
   * piuparts.conf:
     - New global settings:
       + slave-count
+    - Use installation-dependent defaults for known-problem-directory.
   * distros.conf:
     - Update backports setup after integration into the regular archive.
     - Enable stable security updates when installing stable backports.
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index e7c0d42..ff2a21b 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -68,7 +68,6 @@ master-directory = /srv/piuparts.debian.org/master
 slave-directory = /srv/piuparts.debian.org/slave
 basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
 output-directory = /srv/piuparts.debian.org/htdocs
-known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
 backup-directory = /srv/piuparts.debian.org/backup
 tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index bb4b130..4986cd0 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -90,7 +90,6 @@ master-directory = /srv/piuparts.debian.org/master
 slave-directory = /srv/piuparts.debian.org/slave
 basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
 output-directory = /srv/piuparts.debian.org/htdocs
-known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
 backup-directory = /srv/piuparts.debian.org/backup
 tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
diff --git a/instances/piuparts.conf.piu-slave-bm-a b/instances/piuparts.conf.piu-slave-bm-a
index 72ebdde..6e422ca 100644
--- a/instances/piuparts.conf.piu-slave-bm-a
+++ b/instances/piuparts.conf.piu-slave-bm-a
@@ -91,7 +91,6 @@ master-directory = /srv/piuparts.debian.org/master
 slave-directory = /srv/piuparts.debian.org/slave
 basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
 output-directory = /srv/piuparts.debian.org/htdocs
-known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
 backup-directory = /srv/piuparts.debian.org/backup
 tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
diff --git a/master-bin/detect_well_known_errors b/master-bin/detect_well_known_errors
index 1a3ce24..bc91540 100755
--- a/master-bin/detect_well_known_errors
+++ b/master-bin/detect_well_known_errors
@@ -81,7 +81,7 @@ class WKE_Config( piupartslib.conf.Config ):
                 "sections": "report",
                 "output-directory": "html",
                 "master-directory": ".",
-                "known-problem-directory": None,
+                "known-problem-directory": "@sharedir@/piuparts/known_problems",
                 "proxy": None,
             }, "" )
 
diff --git a/piuparts-report.py b/piuparts-report.py
index 81dfaea..3aa25bc 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -413,6 +413,7 @@ class Config(piupartslib.conf.Config):
                 "upgrade-test-distros": None,
                 "max-reserved": 1,
                 "doc-root": "/",
+                "known-problem-directory": "@sharedir@/piuparts/known_problems",
             },
             defaults_section=defaults_section)
 

-- 
piuparts git repository