X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=183c1bb5b1f7bf6ba8ba5d10e288a9039083a780;hb=6b790434ac5d30b64681fa45fb020942561fce1a;hp=9e216c5e2033f1b59f4c14b3dc249b2a493527a7;hpb=a2f694e9c7b834183482e9c89f8ae0c9002cd1f1;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 9e216c5e..183c1bb5 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -51,7 +51,7 @@ sources = set() def html_header(name, filestoexamine): if name.endswith('.changes'): name = ' '.join(name.split('_')[:2]) - print """ + result = """ + """%{"name":name} # we assume only one source (.dsc) per changes here - print """ + result += """ " + +"""%{"pkg":packagename} + result += " " + return result def html_footer(): - print """

Timestamp: %s (UTC)

"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) - print """

+ result = """

Timestamp: %s (UTC)

+"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) + result += """

Valid HTML 4.01! @@ -139,7 +144,8 @@ def html_footer(): """ -#""" + return result + ################################################################################ @@ -167,34 +173,29 @@ def do_pkg(changes_file): new = determine_new(u.pkg.changes, files, 0) - stdout_fd = sys.stdout - htmlname = changes["source"] + "_" + changes["version"] + ".html" sources.add(htmlname) # do not generate html output if that source/version already has one. if not os.path.exists(os.path.join(cnf["Show-New::HTMLPath"],htmlname)): - sys.stdout = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w") + outfile = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w") filestoexamine = [] for pkg in new.keys(): for fn in new[pkg]["files"]: filestoexamine.append(fn) - html_header(changes["source"], filestoexamine) + print >> outfile, html_header(changes["source"], filestoexamine) check_valid(new) distribution = changes["distribution"].keys()[0] - examine_package.display_changes(distribution, changes_file) + print >> outfile, examine_package.display_changes(distribution, changes_file) for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): - examine_package.check_dsc(distribution, fn) + print >> outfile, examine_package.check_dsc(distribution, fn) for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine): - examine_package.check_deb(distribution, fn) + print >> outfile, examine_package.check_deb(distribution, fn) - html_footer() - if sys.stdout != stdout_fd: - sys.stdout.close() - sys.stdout = stdout_fd + print >> outfile, html_footer() session.close() ################################################################################