X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a3b59738df18c7c7d5b9e04d3719463b0582b15a;hb=49c85ab8a723a425cc6539dd138dcd9e0913ab9f;hp=1f688919df9bf37f56ef8e637e96aae38ad8ba89;hpb=8cb1abe7c2f08bc22fd3ddfcfce55e6183cd297e;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 1f688919..a3b59738 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -44,7 +44,8 @@ except ImportError: from daklib import utils from daklib.queue import Upload -from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, get_uid_from_fingerprint +from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, \ + get_uid_from_fingerprint, get_policy_queue from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * @@ -56,7 +57,7 @@ row_number = 0 def usage(exit_code=0): print """Usage: dak queue-report -Prints a report of packages in queue directories (usually new and byhand). +Prints a report of packages in queues (usually new and byhand). -h, --help show this help and exit. -8, --822 writes 822 formated output to the location set in dak.conf @@ -178,6 +179,7 @@ def header(): Debian NEW and BYHAND Packages @@ -222,6 +225,7 @@ def header(): def footer(): print "

Timestamp: %s (UTC)

" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) + print "

There are graphs about the queues available.

" print """

@@ -244,8 +248,8 @@ def table_header(type, source_count, total_count): print "

Summary for: %s

" % (type) print "" % (type) print """ +

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) @@ -288,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)) @@ -309,8 +316,8 @@ 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)) - except Exception, e: + print "Sponsor: %s@debian.org " % (utils.html_escape(login), utils.html_escape(login)) + except Exception as e: pass print "Fingerprint: %s" % (fingerprint) @@ -353,7 +360,7 @@ RRA:MAX:0.5:288:795 try: rc = rrdtool.create(create) ru = rrdtool.update(update) - except rrdtool.error, e: + except rrdtool.error as e: print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e)) except NameError: pass @@ -370,7 +377,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): u.load_changes(filename) cache[filename] = copy(u.pkg.changes) cache[filename]["filename"] = filename - except Exception, e: + except Exception as e: print "WARNING: Exception %s" % e continue # Divide the .changes into per-source groups @@ -436,7 +443,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): session = DBConn().session() dbc = session.query(DBChange).filter_by(changesname=changesbase).one() session.close() - except Exception, e: + except Exception as e: print "Can't find changes file in NEW for %s (%s)" % (changesbase, e) dbc = None @@ -445,7 +452,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): (maintainer["maintainer822"], maintainer["maintainer2047"], maintainer["maintainername"], maintainer["maintaineremail"]) = \ fix_maintainer (j["maintainer"]) - except ParseMaintError, msg: + except ParseMaintError as msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" maintainer["maintaineremail"] = "Unknown" @@ -455,7 +462,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ fix_maintainer (j["changed-by"]) - except ParseMaintError, msg: + except ParseMaintError as msg: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ ("", "", "", "") @@ -548,7 +555,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): (name, mail) = changedby.split(":", 1) log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: - log.write("Sponsored-By: " + sponsor + "\n") + log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n") log.write("Distribution:") for dist in distribution: log.write(" " + dist) @@ -612,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() @@ -624,15 +631,15 @@ def main(): # Initialize db so we can get the NEW comments dbconn = DBConn() - directories = [ ] + queue_names = [ ] if Cnf.has_key("Queue-Report::Options::Directories"): for i in Cnf["Queue-Report::Options::Directories"].split(","): - directories.append(i) + queue_names.append(i) elif Cnf.has_key("Queue-Report::Directories"): - directories = Cnf.ValueList("Queue-Report::Directories") + queue_names = Cnf.value_list("Queue-Report::Directories") else: - directories = [ "byhand", "new" ] + queue_names = [ "byhand", "new" ] if Cnf.has_key("Queue-Report::Options::Rrd"): rrd_dir = Cnf["Queue-Report::Options::Rrd"] @@ -646,24 +653,20 @@ def main(): # 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, f, rrd_dir) + session = dbconn.session() + + for queue_name in queue_names: + queue = get_policy_queue(queue_name, session) + if queue: + directory = os.path.abspath(queue.path) + changes_files = glob.glob("%s/.changes" % (directory)) + process_changes_files(changes_files, os.path.basename(directory), f, rrd_dir) + else: + utils.warn("Cannot find queue %s" % queue_name) if Cnf.has_key("Queue-Report::Options::822"): f.close() - if Cnf.has_key("Queue-Report::Options::New"): - for dir in directories: - print """ - - - - - - -""" % ((dir,)*12) - if Cnf.has_key("Queue-Report::Options::New"): footer()

Summary for: %s

Summary for: binary-%s only