X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=f64027131d3430173c5b2425038340f93eb95266;hb=381be2d32b282b8c547bb328834e587755e1a832;hp=674eca391917220e7c297db232c72520be8d2fc6;hpb=57750c00438df3775be51ce86c4fd1ac36df98c3;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py old mode 100755 new mode 100644 index 674eca39..f6402713 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -29,7 +29,7 @@ import copy, os, sys, time import apt_pkg import examine_package import daklib.database -import daklib.queue +import daklib.queue as queue import daklib.utils # Globals @@ -51,42 +51,42 @@ def html_header(name): """ print "%s - Debian NEW package overview" % (name) print """ - - - -
- + + + +
+ - + Debian Project -
-
- - - +
+ +
+ + + """ print """""" % (name) print """ - - - + + - - -
Debian NEW package overview for %s
+
+
- """ +
+ """ def html_footer(): print "

Timestamp: %s (UTC)

" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) print """ Valid HTML 4.01! - + Valid CSS! """ @@ -106,7 +106,7 @@ def do_pkg(changes_file): changes["suite"] = copy.copy(changes["distribution"]) # 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 @@ -117,17 +117,17 @@ def do_pkg(changes_file): sys.stdout = open(os.path.join(Cnf["Show-New::HTMLPath"],htmlname),"w") html_header(changes["source"]) - daklib.queue.check_valid(new) + queue.check_valid(new) examine_package.display_changes(Upload.pkg.changes_file) for pkg in new.keys(): - for file in new[pkg]["files"]: - if ( files[file].has_key("new") and not - files[file]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ): - if file.endswith(".deb") or file.endswith(".udeb"): - examine_package.check_deb(file) - elif file.endswith(".dsc"): - examine_package.check_dsc(file) + for f in new[pkg]["files"]: + if ( files[f].has_key("new") and not + files[f]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ): + if f.endswith(".deb") or f.endswith(".udeb"): + examine_package.check_deb(f) + elif f.endswith(".dsc"): + examine_package.check_dsc(f) html_footer() if sys.stdout != stdout_fd: @@ -161,7 +161,7 @@ def init(): if Options["help"]: usage() - Upload = daklib.queue.Upload(Cnf) + Upload = queue.Upload(Cnf) projectB = Upload.projectB @@ -184,8 +184,8 @@ def main(): do_pkg (changes_file) files = set(os.listdir(Cnf["Show-New::HTMLPath"])) to_delete = 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)) ################################################################################