X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=8e338e526181c9d5d16dd4737ae7b36e6dce725e;hb=1fa1f22b70c6ee46aea78ee40b9797a574d7c583;hp=dfd2861627dd467d7d16496f77d72e1e828d87ec;hpb=3faae2e561d20b8683fdbb7600f9f52dbb6d50eb;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index dfd28616..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 @@ -268,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) @@ -298,13 +301,13 @@ def process_changes_files(changes_files, type, log): # 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(): @@ -327,7 +330,7 @@ def process_changes_files(changes_files, type, log): 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 @@ -351,6 +354,7 @@ def process_changes_files(changes_files, type, log): 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: @@ -362,7 +366,7 @@ def process_changes_files(changes_files, type, log): 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" @@ -372,7 +376,7 @@ def process_changes_files(changes_files, type, log): 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"]) = \ @@ -400,7 +404,7 @@ def process_changes_files(changes_files, type, log): note = " | [N]" else: note = "" - entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, cache[filename]["filename"]]) + 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. @@ -454,10 +458,10 @@ def process_changes_files(changes_files, type, log): log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n") log.write("Queue: " + type + "\n") - (name, mail) = maint.split(":") + (name, mail) = maint.split(":", 1) log.write("Maintainer: " + name + " <"+mail+">" + "\n") if changedby: - (name, mail) = changedby.split(":") + (name, mail) = changedby.split(":", 1) log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: log.write("Sponsored-By: " + sponsor + "\n") @@ -484,7 +488,7 @@ def process_changes_files(changes_files, type, log): 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"): @@ -493,7 +497,7 @@ def process_changes_files(changes_files, type, log): 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: @@ -510,7 +514,7 @@ def process_changes_files(changes_files, type, log): ################################################################################ def main(): - global Cnf, Upload + global Cnf Cnf = utils.get_conf() Arguments = [('h',"help","Queue-Report::Options::Help"), @@ -529,11 +533,12 @@ def main(): if Options["Help"]: usage() - Upload = queue.Upload(Cnf) - if Cnf.has_key("Queue-Report::Options::New"): header() + # Initialize db so we can get the NEW comments + dbconn = DBConn() + directories = [ ] if Cnf.has_key("Queue-Report::Options::Directories"):