X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=dba38769a5a9d96b9bbc4080f6ce2b3f11768db6;hb=01155cdff0ed5580dac035e03f0c7cc318a635cf;hp=cb2b93904a974d5800be5b2a0e6689cecd27b198;hpb=1a81c5c282979e4660c7e1f3464ced526b100faf;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index cb2b9390..dba38769 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -179,6 +179,7 @@ def header(): Debian NEW and BYHAND Packages @@ -246,8 +248,8 @@ def table_header(type, source_count, total_count): print "

Summary for: %s

" % (type) print "

Summary for: binary-%s only

" % (type) print """ +

Click to toggle all/binary-NEW packages

-

Click to toggle all/binary-NEW packages

""" print "Package count in %s: %s |  Total Package count: %s" % (type, source_count, total_count) @@ -314,7 +316,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing if sponsor: try: (login, domain) = sponsor.split("@", 1) - print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) + print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) except Exception as e: pass @@ -381,6 +383,8 @@ def process_changes_files(changes_files, type, log, rrd_dir): # Divide the .changes into per-source groups per_source = {} for filename in cache.keys(): + if not cache[filename].has_key("source"): + continue source = cache[filename]["source"] if not per_source.has_key(source): per_source[source] = {} @@ -617,9 +621,9 @@ def main(): if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" - apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) + apt_pkg.parse_commandline(Cnf, Arguments, sys.argv) - Options = Cnf.SubTree("Queue-Report::Options") + Options = Cnf.subtree("Queue-Report::Options") if Options["Help"]: usage() @@ -635,7 +639,7 @@ def main(): for i in Cnf["Queue-Report::Options::Directories"].split(","): queue_names.append(i) elif Cnf.has_key("Queue-Report::Directories"): - queue_names = Cnf.ValueList("Queue-Report::Directories") + queue_names = Cnf.value_list("Queue-Report::Directories") else: queue_names = [ "byhand", "new" ]