X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=217186c3280888230540754dad679e6ffb542de3;hb=bec35cdf1e8d4b78f0cd539660b6a469100b12d2;hp=0b8a44222a4494704fd64a503222ace16feede92;hpb=7be2069562f3ca875c3ac29efb806d019cd08acd;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 0b8a4422..217186c3 100755 --- 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) @@ -391,19 +393,17 @@ def check_deb (deb_filename): output_deb_info(deb_filename) if is_a_udeb: - headline("skipping lintian check for µdeb") + headline("skipping lintian check for udeb") print 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) if is_a_udeb: - headline("skipping copyright for µdeb") + headline("skipping copyright for udeb") else: headline("copyright of %s" % (filename)) print_copyright(deb_filename)