X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=cb2b93904a974d5800be5b2a0e6689cecd27b198;hb=1a81c5c282979e4660c7e1f3464ced526b100faf;hp=19673d5593a0d313de1d97598d0236c6b4cffd9f;hpb=163369d3a452071eaa159cca4b8a76b063823af6;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 19673d55..cb2b9390 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 @@ -222,6 +223,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 """
@@ -288,7 +290,10 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing else: print "" % (trclass) - print "%s" % (source) + if "binNEW" in trclass: + print "%s" % (source) + else: + print "%(source)s" % {'source': source} print "" for vers in version.split(): print "%s
" % (source, utils.html_escape(vers), utils.html_escape(vers)) @@ -310,7 +315,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing try: (login, domain) = sponsor.split("@", 1) print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) - except Exception, e: + except Exception as e: pass print "Fingerprint: %s" % (fingerprint) @@ -350,8 +355,11 @@ RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:795 """.strip().split("\n") - rrdtool.create(*create) - rrdtool.update(*update) + try: + rc = rrdtool.create(*create) + ru = rrdtool.update(*update) + except rrdtool.error as e: + print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e)) except NameError: pass @@ -367,7 +375,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 @@ -433,7 +441,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 @@ -442,7 +450,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" @@ -452,7 +460,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"]) = \ ("", "", "", "") @@ -545,7 +553,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) @@ -621,15 +629,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.ValueList("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"] @@ -643,24 +651,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 """ -

%s, last day

-

%s, last week

-

%s, last month

-

%s, last year

-

%s, last 5 years

-

%s, last 10 years

-""" % ((dir,)*12) - if Cnf.has_key("Queue-Report::Options::New"): footer()