From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 7 Jan 2008 00:09:30 +0000 (+0100)
Subject: Merge lintian html fixes
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=73ec00c395f4e560e6b7df5e8422d45662025d3d;hp=-c;p=dak.git

Merge lintian html fixes
---

73ec00c395f4e560e6b7df5e8422d45662025d3d
diff --combined ChangeLog
index d3d3a8c6,59c4b419..90c033a7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2008-01-07  Joerg Jaspert  <joerg@debian.org>
 +
 +	* 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 --combined dak/examine_package.py
index fa1e4223,52eeffc7..217186c3
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@@ -334,16 -334,18 +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)
@@@ -396,6 -398,8 +398,6 @@@ def check_deb (deb_filename)
      else:
  	headline("lintian check for %s" % (filename))
          do_lintian(deb_filename)
 -	headline("---- linda check for %s ----" % (filename))
 -        do_command ("linda", deb_filename)
  
      headline("contents of %s" % (filename))
      do_command ("dpkg -c", deb_filename)