[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.50-46-gfb2efac

[David Steele]

The following commit has been merged in the develop branch:
commit 42276173b77699ab660d783848157deebce849b9
Author: David Steele <dsteele at gmail.com>
Date:   Wed Jan 9 22:49:17 2013 -0500

    detect_well_known_errors - Integrate the package templates.
    
    PKG_ISSUE_TEMPLATE can be replaced with the existing
    PKG_ERROR_TEMPLATE.

diff --git a/debian/changelog b/debian/changelog
index 93bbecd..ac42d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ piuparts (0.51) UNRELEASED; urgency=low
   * detect_well_known_errors:
     - Replace the bash script with an equivalent Python script.
     - Minor HTML syntax fix.
+    - Minor template integration.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
 
diff --git a/master-bin/detect_well_known_errors b/master-bin/detect_well_known_errors
index 5aa3101..863535d 100755
--- a/master-bin/detect_well_known_errors
+++ b/master-bin/detect_well_known_errors
@@ -65,10 +65,6 @@ PKG_ERROR_TPL = \
 $BUG</li>
 """
 
-PKG_ISSUE_TPL = \
-"""<li><a href=\"$LOG\">$LOG</a> (<a href=\"http://bugs.debian.org/$PACKAGE?dist=unstable\" target=\"_blank\">BTS</a>)</li>
-"""
-
 class WKE_Config( piupartslib.conf.Config ):
     """Configuration parameters for Well Known Errors"""
 
@@ -315,15 +311,10 @@ def update_html( section, logdict, problem_list, failures, config ):
         os.mkdir( html_dir )
 
     for problem in problem_list:
-        if problem.name[-11:] == "_error.conf":
-           ptpl = PKG_ERROR_TPL
-        else:
-           ptpl = PKG_ISSUE_TPL
-
         update_tpl( html_dir, section, problem,
                     failures.filtered(problem.name),
                     logdict,
-                    ptpl, PROB_TPL )
+                    PKG_ERROR_TPL, PROB_TPL )
 
     # Make a failure list of all failed packages that don't show up as known
     failedpkgs = set([x for x in logdict.keys()

-- 
piuparts git repository