%(name)s - Debian NEW package overview

X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=e355c37f7f42c4a119fdbcc081b0aa573cd7a898;hb=b612f3da207fa0d75a5d3b204ac8f02bb244231a;hp=445f6d2a54888521abf67b706fa61be20d0af6b4;hpb=c60719bc9a46557970c0c43e90d6f7d0469230b0;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 445f6d2a..e355c37f 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Output html for packages in NEW +""" Output html for packages in NEW """ # Copyright (C) 2007 Joerg Jaspert # This program is free software; you can redistribute it and/or modify @@ -28,9 +28,9 @@ import copy, os, sys, time import apt_pkg import examine_package -import daklib.database -import daklib.queue -import daklib.utils +from daklib import database +from daklib import queue +from daklib import utils # Globals Cnf = None @@ -53,7 +53,7 @@ def html_header(name, filestoexamine): %(name)s - Debian NEW package overview - + - +

-

corner image

Navigation

-

-

-

+

+

+

""" for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine): - packagename = fn.split('_')[0] - print """ -

%(pkg)s

-

-

-

-

-

- """%{"pkg":packagename} + packagename = fn.split('_')[0] + print """ +

%(pkg)s

+

+

+

+

+

+ """%{"pkg":packagename} print "

" - + def html_footer(): print """

Timestamp: %s (UTC)

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

@@ -144,9 +147,9 @@ def do_pkg(changes_file): changes = Upload.pkg.changes changes["suite"] = copy.copy(changes["distribution"]) - + distribution = changes["distribution"].keys()[0] # Find out what's new - new = daklib.queue.determine_new(changes, files, projectB, 0) + new = queue.determine_new(changes, files, projectB, 0) stdout_fd = sys.stdout @@ -165,14 +168,13 @@ def do_pkg(changes_file): html_header(changes["source"], filestoexamine) - daklib.queue.check_valid(new) - examine_package.display_changes(Upload.pkg.changes_file) + queue.check_valid(new) + examine_package.display_changes( distribution, Upload.pkg.changes_file) - for fn in filestoexamine: - if fn.endswith(".deb") or fn.endswith(".udeb"): - examine_package.check_deb(fn) - elif fn.endswith(".dsc"): - examine_package.check_dsc(fn) + for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): + 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) html_footer() if sys.stdout != stdout_fd: @@ -193,7 +195,7 @@ def usage (exit_code=0): def init(): global Cnf, Options, Upload, projectB - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Show-New::Options::Help"), ("p","html-path","Show-New::HTMLPath","HasArg")] @@ -208,7 +210,7 @@ def init(): if Options["help"]: usage() - Upload = daklib.queue.Upload(Cnf) + Upload = queue.Upload(Cnf) projectB = Upload.projectB @@ -224,15 +226,15 @@ def main(): examine_package.use_html=1 for changes_file in changes_files: - changes_file = daklib.utils.validate_changes_file_arg(changes_file, 0) + changes_file = utils.validate_changes_file_arg(changes_file, 0) if not changes_file: continue print "\n" + changes_file do_pkg (changes_file) files = set(os.listdir(Cnf["Show-New::HTMLPath"])) to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources)) - for file in to_delete: - os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file)) + for f in to_delete: + os.remove(os.path.join(Cnf["Show-New::HTMLPath"],f)) ################################################################################