X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fqueue_report.py;h=ff2dbc8e7ad64198613d06744a30276e1103599e;hb=02ab667baabe24ed8fc1d1daa797c2ad966ea23d;hp=341e0ff36700f45d47c3e68be8940efa39cb2646;hpb=a59ca3145f204083ffcf5edf322d5b6ee2c4e0f8;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index 341e0ff3..ff2dbc8e 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -34,19 +34,19 @@
################################################################################
-import copy, glob, os, stat, sys, time
+from copy import copy
+import glob, os, stat, sys, time
import apt_pkg
-import cgi
-from daklib import queue
-from daklib import database
+
from daklib import utils
+from daklib.queue import Upload
+from daklib.dbconn import DBConn, has_new_comment, DBChange, get_uid_from_fingerprint
+from daklib.textutils import fix_maintainer
from daklib.dak_exceptions import *
Cnf = None
-Upload = None
direction = []
row_number = 0
-projectB = None
################################################################################
@@ -277,11 +277,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
(name, mail) = changedby.split(":", 1)
print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name))
- try:
- (login, domain) = sponsor.split("@", 1)
- print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
- except:
- pass
+ if sponsor:
+ try:
+ (login, domain) = sponsor.split("@", 1)
+ print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
+ except Exception, e:
+ pass
print "Fingerprint: %s" % (fingerprint)
print ""
@@ -295,18 +296,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
############################################################
def process_changes_files(changes_files, type, log):
+ session = DBConn().session()
msg = ""
cache = {}
# Read in all the .changes files
for filename in changes_files:
try:
- Upload.pkg.changes_file = filename
- Upload.init_vars()
- Upload.update_vars()
- cache[filename] = copy.copy(Upload.pkg.changes)
+ u = Upload()
+ u.load_changes(filename)
+ cache[filename] = copy(u.pkg.changes)
cache[filename]["filename"] = filename
- except:
- break
+ except Exception, e:
+ print "WARNING: Exception %s" % e
+ continue
# Divide the .changes into per-source groups
per_source = {}
for filename in cache.keys():
@@ -329,7 +331,7 @@ def process_changes_files(changes_files, type, log):
else:
if mtime < oldest:
oldest = mtime
- have_note += (database.has_new_comment(d["source"], d["version"])
+ have_note += has_new_comment(d["source"], d["version"])
per_source[source]["oldest"] = oldest
if not have_note:
per_source[source]["note_state"] = 0; # none
@@ -361,11 +363,18 @@ def process_changes_files(changes_files, type, log):
arches = {}
versions = {}
for j in i[1]["list"]:
+ changesbase = os.path.basename(j["filename"])
+ try:
+ dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
+ except Exception, e:
+ print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
+ dbc = None
+
if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"):
try:
(maintainer["maintainer822"], maintainer["maintainer2047"],
maintainer["maintainername"], maintainer["maintaineremail"]) = \
- utils.fix_maintainer (j["maintainer"])
+ fix_maintainer (j["maintainer"])
except ParseMaintError, msg:
print "Problems while parsing maintainer address\n"
maintainer["maintainername"] = "Unknown"
@@ -375,7 +384,7 @@ def process_changes_files(changes_files, type, log):
try:
(changeby["changedby822"], changeby["changedby2047"],
changeby["changedbyname"], changeby["changedbyemail"]) = \
- utils.fix_maintainer (j["changed-by"])
+ fix_maintainer (j["changed-by"])
except ParseMaintError, msg:
(changeby["changedby822"], changeby["changedby2047"],
changeby["changedbyname"], changeby["changedbyemail"]) = \
@@ -384,9 +393,14 @@ def process_changes_files(changes_files, type, log):
distribution=j["distribution"].keys()
closes=j["closes"].keys()
- fingerprint=j["fingerprint"]
- if j.has_key("sponsoremail"):
- sponsor=j["sponsoremail"]
+ if dbc:
+ fingerprint = dbc.fingerprint
+ sponsor_name = get_uid_from_fingerprint(fingerprint).name
+ sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org"
+ if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \
+ sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]:
+ sponsor = sponsor_email
+
for arch in j["architecture"].keys():
arches[arch] = ""
version = j["version"]
@@ -513,7 +527,7 @@ def process_changes_files(changes_files, type, log):
################################################################################
def main():
- global Cnf, Upload
+ global Cnf
Cnf = utils.get_conf()
Arguments = [('h',"help","Queue-Report::Options::Help"),
@@ -532,12 +546,12 @@ def main():
if Options["Help"]:
usage()
- Upload = queue.Upload(Cnf)
- projectB = Upload.projectB
-
if Cnf.has_key("Queue-Report::Options::New"):
header()
+ # Initialize db so we can get the NEW comments
+ dbconn = DBConn()
+
directories = [ ]
if Cnf.has_key("Queue-Report::Options::Directories"):