X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=8e338e526181c9d5d16dd4737ae7b36e6dce725e;hb=1fa1f22b70c6ee46aea78ee40b9797a574d7c583;hp=ecf52e16c67e10d43faf7205510aaf9fbfb94ec1;hpb=e1701b4a78268936e895072f292c88311ffcc6ce;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index ecf52e16..8e338e52 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Produces a report on NEW and BYHAND packages +""" Produces a report on NEW and BYHAND packages """ # Copyright (C) 2001, 2002, 2003, 2005, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -34,15 +34,17 @@ ################################################################################ -import copy, glob, os, stat, sys, time +from copy import copy +import glob, os, stat, sys, time import apt_pkg -import cgi -from daklib import queue + from daklib import utils +from daklib.changes import Changes +from daklib.dbconn import DBConn, has_new_comment +from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * Cnf = None -Upload = None direction = [] row_number = 0 @@ -58,6 +60,7 @@ Prints a report of packages in queue directories (usually new and byhand). -s, --sort=key sort output according to key, see below. -a, --age=key if using sort by age, how should time be treated? If not given a default of hours will be used. + -d, --directories=key A comma seperated list of queues to be scanned Sorting Keys: ao=age, oldest first. an=age, newest first. na=name, ascending nd=name, descending @@ -267,17 +270,18 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing print "%s
" % (dist) print "" print "%s" % (last_mod) - (name, mail) = maint.split(":") + (name, mail) = maint.split(":", 1) print "" print "Maintainer: %s
" % (utils.html_escape(mail), utils.html_escape(name)) - (name, mail) = changedby.split(":") + (name, mail) = changedby.split(":", 1) print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name)) try: - (login, domain) = sponsor.split("@") + (login, domain) = sponsor.split("@", 1) print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) - except: + except Exception, e: + print "WARNING: Exception %s" % e pass print "Fingerprint: %s" % (fingerprint) @@ -291,19 +295,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing ############################################################ -def process_changes_files(changes_files, type): +def process_changes_files(changes_files, type, log): msg = "" cache = {} # Read in all the .changes files for filename in changes_files: try: - Upload.pkg.changes_file = filename - Upload.init_vars() - Upload.update_vars() - cache[filename] = copy.copy(Upload.pkg.changes) + c = Changes() + c.load_dot_dak(filename) + cache[filename] = copy(c.changes) cache[filename]["filename"] = filename - except: - break + except Exception, e: + print "WARNING: Exception %s" % e + continue # Divide the .changes into per-source groups per_source = {} for filename in cache.keys(): @@ -326,7 +330,7 @@ def process_changes_files(changes_files, type): else: if mtime < oldest: oldest = mtime - have_note += (d.has_key("process-new note")) + have_note += has_new_comment(d["source"], d["version"]) per_source[source]["oldest"] = oldest if not have_note: per_source[source]["note_state"] = 0; # none @@ -350,6 +354,7 @@ def process_changes_files(changes_files, type): changeby = {} changedby="" sponsor="" + filename=i[1]["list"][0]["filename"] last_modified = time.time()-i[1]["oldest"] source = i[1]["list"][0]["source"] if len(source) > max_source_len: @@ -357,11 +362,11 @@ def process_changes_files(changes_files, type): arches = {} versions = {} for j in i[1]["list"]: - if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options:822"): + if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"): try: (maintainer["maintainer822"], maintainer["maintainer2047"], maintainer["maintainername"], maintainer["maintaineremail"]) = \ - utils.fix_maintainer (j["maintainer"]) + fix_maintainer (j["maintainer"]) except ParseMaintError, msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" @@ -371,7 +376,7 @@ def process_changes_files(changes_files, type): try: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ - utils.fix_maintainer (j["changed-by"]) + fix_maintainer (j["changed-by"]) except ParseMaintError, msg: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ @@ -399,7 +404,7 @@ def process_changes_files(changes_files, type): note = " | [N]" else: note = "" - entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby]) + entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) # direction entry consists of "Which field, which direction, time-consider" where # time-consider says how we should treat last_modified. Thats all. @@ -438,42 +443,40 @@ def process_changes_files(changes_files, type): # have with it. (If you combine options it will simply take the last one at the moment). # Will be enhanced in the future. - if Cnf.has_key("Queue-Report::Options:822"): - # Open the report file - f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") - + if Cnf.has_key("Queue-Report::Options::822"): # print stuff out in 822 format for entry in entries: - (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry + (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry # We'll always have Source, Version, Arch, Mantainer, and Dist # For the rest, check to see if we have them, then print them out - f.write("Source: " + source + "\n") - f.write("Version: " + version_list + "\n") - f.write("Architectures:") - f.write( (", ".join(arch_list.split(" "))) + "\n") - f.write("Age: " + time_pp(last_modified) + "\n") - - (name, mail) = maint.split(":") - f.write("Maintainer: " + name + " <"+mail+">" + "\n") + log.write("Source: " + source + "\n") + log.write("Version: " + version_list + "\n") + log.write("Architectures: ") + log.write( (", ".join(arch_list.split(" "))) + "\n") + log.write("Age: " + time_pp(last_modified) + "\n") + log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n") + log.write("Queue: " + type + "\n") + + (name, mail) = maint.split(":", 1) + log.write("Maintainer: " + name + " <"+mail+">" + "\n") if changedby: - (name, mail) = changedby.split(":") - f.write("Changed-By: " + name + " <"+mail+">" + "\n") + (name, mail) = changedby.split(":", 1) + log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: - (name, mail) = sponsor.split(":") - f.write("Sponsored-By: " + name + " <"+mail+">" + "\n") - f.write("Distribution:") + log.write("Sponsored-By: " + sponsor + "\n") + log.write("Distribution:") for dist in distribution: - f.write(" " + dist) - f.write("\n") - f.write("Fingerprint: " + fingerprint + "\n") + log.write(" " + dist) + log.write("\n") + log.write("Fingerprint: " + fingerprint + "\n") if closes: bug_string = "" for bugs in closes: bug_string += "#"+bugs+", " - f.write("Closes: " + bug_string[:-2] + "\n") - f.write("\n") - f.close() + log.write("Closes: " + bug_string[:-2] + "\n") + log.write("Changes-File: " + os.path.basename(changes_file) + "\n") + log.write("\n") if Cnf.has_key("Queue-Report::Options::New"): direction.append([4,1,"ao"]) @@ -485,16 +488,16 @@ def process_changes_files(changes_files, type): source_count = len(per_source_items) table_header(type.upper(), source_count, total_count) for entry in entries: - (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry + (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby) table_footer(type.upper()) - elif not Cnf.has_key("Queue-Report::Options:822"): + elif not Cnf.has_key("Queue-Report::Options::822"): # The "normal" output without any formatting. format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len) msg = "" for entry in entries: - (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry + (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) if msg: @@ -511,14 +514,15 @@ def process_changes_files(changes_files, type): ################################################################################ def main(): - global Cnf, Upload + global Cnf Cnf = utils.get_conf() Arguments = [('h',"help","Queue-Report::Options::Help"), ('n',"new","Queue-Report::Options::New"), - ('8','822',"Queue-Report::Options:822"), + ('8','822',"Queue-Report::Options::822"), ('s',"sort","Queue-Report::Options::Sort", "HasArg"), - ('a',"age","Queue-Report::Options::Age", "HasArg")] + ('a',"age","Queue-Report::Options::Age", "HasArg"), + ('d',"directories","Queue-Report::Options::Directories", "HasArg")] for i in [ "help" ]: if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" @@ -529,18 +533,33 @@ def main(): if Options["Help"]: usage() - Upload = queue.Upload(Cnf) - if Cnf.has_key("Queue-Report::Options::New"): header() - directories = Cnf.ValueList("Queue-Report::Directories") - if not directories: + # Initialize db so we can get the NEW comments + dbconn = DBConn() + + directories = [ ] + + if Cnf.has_key("Queue-Report::Options::Directories"): + for i in Cnf["Queue-Report::Options::Directories"].split(","): + directories.append(i) + elif Cnf.has_key("Queue-Report::Directories"): + directories = Cnf.ValueList("Queue-Report::Directories") + else: directories = [ "byhand", "new" ] + f = None + if Cnf.has_key("Queue-Report::Options::822"): + # Open the report file + f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") + for directory in directories: changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)])) - process_changes_files(changes_files, directory) + process_changes_files(changes_files, directory, f) + + if Cnf.has_key("Queue-Report::Options::822"): + f.close() if Cnf.has_key("Queue-Report::Options::New"): footer()