X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=cdd1473ad7428a178af0ee2d1e2f8fb4d3944834;hb=7efeb186029866804f6737f49839998d4fa21cd6;hp=9e216c5e2033f1b59f4c14b3dc249b2a493527a7;hpb=a2f694e9c7b834183482e9c89f8ae0c9002cd1f1;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 9e216c5e..cdd1473a 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)
@@ -139,7 +144,8 @@ def html_footer():
"""
-#"""
+ return result
+
################################################################################
@@ -180,18 +186,18 @@ def do_pkg(changes_file):
for fn in new[pkg]["files"]:
filestoexamine.append(fn)
- html_header(changes["source"], filestoexamine)
+ print html_header(changes["source"], filestoexamine)
check_valid(new)
distribution = changes["distribution"].keys()[0]
- examine_package.display_changes(distribution, changes_file)
+ print examine_package.display_changes(distribution, changes_file)
for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
- examine_package.check_dsc(distribution, fn)
+ print 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 examine_package.check_deb(distribution, fn)
- html_footer()
+ print html_footer()
if sys.stdout != stdout_fd:
sys.stdout.close()
sys.stdout = stdout_fd