X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=a47a032463a0f5a18034b8f8331e9bea2cf52e0a;hb=83b5e02a64248a77071d8b45de68821e05e191ab;hp=55b55aa9a7ce4fd447b85b71657e0caeea97a919;hpb=c793fba2649e8f8b00d30beade60ca7626eaddf2;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 55b55aa9..a47a0324 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -91,13 +91,13 @@ def escape_if_needed(s): def headline(s, level=2, bodyelement=None): if use_html: if bodyelement: - print """ + return """ %(title)s (click to toggle) """%{"bodyelement":bodyelement,"title":utils.html_escape(s)} else: - print "%s" % (level, utils.html_escape(s), level) + return "%s" % (level, utils.html_escape(s), level) else: - print "---- %s ----" % (s) + return "---- %s ----" % (s) # Colour definitions, 'end' isn't really for use @@ -154,18 +154,22 @@ def format_field(k,v): def foldable_output(title, elementnameprefix, content, norow=False): d = {'elementnameprefix':elementnameprefix} + header = '' if use_html: - print """
+ header = """
"""%d - headline(title, bodyelement="%(elementnameprefix)s-body"%d) + title = headline(title, bodyelement="%(elementnameprefix)s-body"%d) + body = '' if use_html: - print """ """%d + body = """ """%d if norow: - print content + body = content else: - print output_row(content) + body = output_row(content) + footer = '' if use_html: - print """
""" + footer = """
""" + return header + title + body + footer ################################################################################ @@ -272,7 +276,7 @@ def read_changes_or_dsc (suite, filename): dsc_file = utils.open_file(filename) try: - dsc = utils.parse_changes(filename) + dsc = utils.parse_changes(filename, dsc_file=1) except: return formatted_text("can't parse .dsc control info") dsc_file.close() @@ -306,9 +310,9 @@ def read_changes_or_dsc (suite, filename): def create_depends_string (suite, depends_tree): result = "" if suite == 'experimental': - suite_where = " in ('experimental','unstable')" + suite_where = "in ('experimental','unstable')" else: - suite_where = " ='%s'" % suite + suite_where = "= '%s'" % suite comma_count = 1 session = DBConn().session() @@ -360,7 +364,7 @@ def output_package_relations (): to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation]) package_relations.clear() - foldable_output("Package relations", "relations", to_print) + print foldable_output("Package relations", "relations", to_print) def output_deb_info(suite, filename, packagename): (control, control_keys, section, depends, recommends, arch, maintainer) = read_control(filename) @@ -462,9 +466,9 @@ def get_readme_source (dsc_filename): def check_dsc (suite, dsc_filename): (dsc) = read_changes_or_dsc(suite, dsc_filename) - foldable_output(dsc_filename, "dsc", dsc, norow=True) - foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename)) - foldable_output("README.source for %s" % dsc_filename, "source-readmesource", get_readme_source(dsc_filename)) + print foldable_output(dsc_filename, "dsc", dsc, norow=True) + print foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename)) + print foldable_output("README.source for %s" % dsc_filename, "source-readmesource", get_readme_source(dsc_filename)) def check_deb (suite, deb_filename): filename = os.path.basename(deb_filename) @@ -476,27 +480,27 @@ def check_deb (suite, deb_filename): is_a_udeb = 0 - foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename, + print foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename, output_deb_info(suite, deb_filename, packagename), norow=True) if is_a_udeb: - foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename, + print foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename, "") else: - foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename, + print foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename, do_lintian(deb_filename)) - foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename, + print foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename, do_command("dpkg -c", deb_filename)) if is_a_udeb: - foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename, + print foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename, "") else: - foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename, + print foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename, get_copyright(deb_filename)) - foldable_output("file listing of %s" % (filename), "binary-%s-file-listing"%packagename, + print foldable_output("file listing of %s" % (filename), "binary-%s-file-listing"%packagename, do_command("ls -l", deb_filename)) # Read a file, strip the signature and return the modified contents as @@ -529,7 +533,7 @@ def strip_pgp_signature (filename): def display_changes(suite, changes_filename): changes = read_changes_or_dsc(suite, changes_filename) - foldable_output(changes_filename, "changes", changes, norow=True) + print foldable_output(changes_filename, "changes", changes, norow=True) def check_changes (changes_filename): try: @@ -579,7 +583,7 @@ def main (): elif f.endswith(".deb") or f.endswith(".udeb"): # default to unstable when we don't have a .changes file # perhaps this should be a command line option? - check_deb('unstable', file) + check_deb('unstable', f) elif f.endswith(".dsc"): check_dsc('unstable', f) else: