X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fqueue_report.py;h=5fd9288a8c6da8711b48e1eff274f213e169c955;hb=b5a756d8ad61414c90ad4c0bd80f98f27c9f8659;hp=cb5c05eda0813632553274876fc64601a70b287a;hpb=81816f8c1be86651dd5200440ab09caccf1460b2;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index cb5c05ed..5fd9288a 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 *
@@ -311,7 +312,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
try:
(login, domain) = sponsor.split("@", 1)
print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
- except Exception, e:
+ except Exception as e:
pass
print "Fingerprint: %s" % (fingerprint)
@@ -354,7 +355,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
@@ -371,7 +372,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
@@ -437,7 +438,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
@@ -446,7 +447,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"
@@ -456,7 +457,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"]) = \
("", "", "", "")
@@ -654,7 +655,7 @@ def main():
if queue:
directory = os.path.abspath(queue.path)
changes_files = glob.glob("%s/*.changes" % (directory))
- process_changes_files(changes_files, directory, f, rrd_dir)
+ process_changes_files(changes_files, os.path.basename(directory), f, rrd_dir)
else:
utils.warn("Cannot find queue %s" % queue_name)