Merge lintian html fixes

diff --git a/ChangeLog b/ChangeLog
index d3d3a8c682357f6ddfbb47bf729d793cc9415b90..90c033a7abb7aab6f9328f71be73ecca2e14b449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
        * dak/examine_package.py (check_deb): Remove linda call. It
        provides no added benefit to lintian anymore.
 
+2008-01-06  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/examine_package.py (do_lintian): lintian now supports html
+       coloring, so use it.
+       (do_command): Dont escape html chars if param escaped = 1
+
 2007-12-31  Anthony Towns  <ajt@debian.org>
 
        * dak/process_new.py (recheck): pass "" for prefix_str to reject()

diff --git a/dak/examine_package.py b/dak/examine_package.py
index fa1e4223c7b2aaa1e6228011a25fd4dbcd249f90..217186c3280888230540754dad679e6ffb542de3 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -334,16 +334,18 @@ def output_deb_info(filename):
             to_print += output + '\n'
         print_escaped_text(to_print)
 
-def do_command (command, filename):
+def do_command (command, filename, escaped=0):
     o = os.popen("%s %s" % (command, filename))
-    print_formatted_text(o.read())
+    if escaped:
+        print_escaped_text(o.read())
+    else:
+        print_formatted_text(o.read())
 
 def do_lintian (filename):
-    # lintian currently does not have html coloring, so dont use color for lintian (yet)
     if use_html:
-        do_command("lintian --show-overrides", filename)
+        do_command("lintian --show-overrides --color html", filename, 1)
     else:
-        do_command("lintian --show-overrides --color always", filename)
+        do_command("lintian --show-overrides --color always", filename, 1)
 
 def print_copyright (deb_filename):
     package = re_package.sub(r'\1', deb_filename)