Merge from Thomas

[dak.git] / dak / examine_package.py

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 72e098d562b91a03b7dcf0ac5b39732bc7b24b89..217186c3280888230540754dad679e6ffb542de3 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -334,15 +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):
     if use_html:
-        do_command("lintian --show-overrides --color html", 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)
@@ -395,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)