[dak/master] convert queue_report to new dbconn/changes API
Signed-off-by: Mark Hymers <mhy@debian.org>
---
dak/queue_report.py | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dak/queue_report.py b/dak/queue_report.py
index a9f027c..4daa3cc 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -34,20 +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.dbconn import DBConn, has_new_comment
from daklib.textutils import fix_maintainer
from daklib.dak_exceptions import *
Cnf = None
-Upload = None
direction = []
row_number = 0
-projectB = None
################################################################################
@@ -301,10 +300,9 @@ def process_changes_files(changes_files, type, log):
# 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)
+ c = Changes()
+ c.load_dot_dak(filename)
+ cache[filename] = copy(c.changes)
cache[filename]["filename"] = filename
except:
break
@@ -330,7 +328,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
@@ -514,7 +512,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"),
@@ -533,12 +531,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"):
--
1.5.6.5
Reply to: