let's be a bit more clever about this

[dak.git] / dak / process_unchecked.py

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index e69919bc99ee79cc33533773e18f48bbc1d23562..9d0fdc9393cb6a13269e5e20af3b1eb9ff3047b1 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -49,7 +49,7 @@ import apt_pkg
 from debian_bundle import deb822
 from daklib.dbconn import *
 from daklib.binary import Binary
-from daklib import logging
+from daklib import daklog
 from daklib import queue
 from daklib import utils
 from daklib.textutils import fix_maintainer
@@ -58,6 +58,7 @@ from daklib.regexes import re_valid_version, re_valid_pkg_name, re_changelog_ver
                            re_strip_revision, re_strip_srcver, re_spacestrip, \
                            re_isanum, re_no_epoch, re_no_revision, re_taint_free, \
                            re_isadeb, re_extract_src_version, re_issource, re_default_answer
+from daklib.summarystats import SummaryStats
 
 from types import *
 
@@ -1082,7 +1083,7 @@ def check_signed_by_key():
         if highest_sid is None:
             reject("Source package %s does not have 'DM-Upload-Allowed: yes' in its most recent version" % changes["source"])
         else:
-            for sup in s.query(SrcUploader).join(DBSource).filter_by(source_id=highest_sid)
+            for sup in s.query(SrcUploader).join(DBSource).filter_by(source_id=highest_sid):
                 (rfc822, rfc2047, name, email) = sup.maintainer.get_split_maintainer()
                 if email == uid_email or name == uid_name:
                     should_reject = False
@@ -1582,7 +1583,7 @@ def main():
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")
             else:
                 raise
-        Logger = Upload.Logger = logging.Logger(Cnf, "process-unchecked")
+        Logger = Upload.Logger = daklog.Logger(Cnf, "process-unchecked")
 
     # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header
     bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $"
@@ -1604,8 +1605,8 @@ def main():
             if not Options["No-Action"]:
                 clean_holding()
 
-    accept_count = Upload.accept_count
-    accept_bytes = Upload.accept_bytes
+    accept_count = SummaryStats().accept_count
+    accept_bytes = SummaryStats().accept_bytes
     if accept_count:
         sets = "set"
         if accept_count > 1: