X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a3b59738df18c7c7d5b9e04d3719463b0582b15a;hb=53dc3cd37e5d6676776cf110a70edff9c46072d9;hp=9c0d2926a16cb2105731dc41009b28ad599751aa;hpb=2cb7a47b72af061ba2a991c218915ee0b97d401b;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 9c0d2926..a3b59738 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

" % (trclass) - print "" % (source) + if "binNEW" in trclass: + print "" % (source) + else: + print "" % {'source': source} print "
""" print "Package count in %s: %s |  Total Package count: %s" % (type, source_count, total_count) @@ -290,7 +292,10 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing else: print "
%s%s%(source)s" for vers in version.split(): print "%s
" % (source, utils.html_escape(vers), utils.html_escape(vers)) @@ -311,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 @@ -614,9 +619,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() @@ -632,7 +637,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" ]