[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 72bd27fa5467e9f9111dcaf03610c3b339cd80ee
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Apr 7 15:28:31 2013 +0200

    dwke: sync config defaults with piuparts-report
    
    need upgrade-test-distros, too, as that is an alternative source for distro
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/TODO b/TODO
index 0975b35..b4de572 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,8 @@ 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
+
 
 for 0.6x:
 
diff --git a/master-bin/detect_well_known_errors b/master-bin/detect_well_known_errors
index 5df612d..f431df9 100755
--- a/master-bin/detect_well_known_errors
+++ b/master-bin/detect_well_known_errors
@@ -79,10 +79,11 @@ class WKE_Config( piupartslib.conf.Config ):
 
         piupartslib.conf.Config.__init__( self, self.section,
             {
-                "sections": "sid",
-                "master-directory": "/var/lib/piuparts/master/",
-                "known-problem-directory": "/usr/share/piuparts/known_problems",
-                "output-directory": "/var/lib/piuparts/htdocs/",
+                "sections": "report",
+                "output-directory": "html",
+                "master-directory": ".",
+                "known-problem-directory": None,
+                "proxy": None,
             }, "" )
 
 class WKE_Section_Config( piupartslib.conf.Config ):
@@ -92,10 +93,11 @@ class WKE_Section_Config( piupartslib.conf.Config ):
 
         piupartslib.conf.Config.__init__( self, self.section,
             {
-                "distro": None,
                 "mirror": None,
+                "distro": None,
                 "area": None,
                 "arch": None,
+                "upgrade-test-distros": None,
             }, "",  defaults_section="global" )
 
 class Problem():
@@ -514,6 +516,8 @@ incorporated by piuparts-report into the final web reports.
 
     conf = WKE_Config()
     conf.read( CONFIG_FILE )
+    if conf["proxy"]:
+        os.environ["http_proxy"] = conf["proxy"]
 
     problem_list = create_problem_list( conf['known-problem-directory'] )
 

-- 
piuparts git repository