X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=777e0791afb72dec03b5d17f0ec4e5901bc4f60f;hb=3fd49b3537079afc226a219cfbe1f807423f92c2;hp=6cbbccff5090fb7f9fd9f39fb6f52c8232228cb3;hpb=0f93456a9271c40a332cd382ca6c2ac415022bb7;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index 6cbbccff..777e0791 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -54,12 +54,14 @@ import contextlib
 import pwd
 import apt_pkg, apt_inst
 import examine_package
+
 from daklib import database
-from daklib import logging
+from daklib import daklog
 from daklib import queue
 from daklib import utils
 from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
 from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError
+from daklib.summarystats import SummaryStats
 
 # Globals
 Cnf = None       #: Configuration, apt_pkg.Configuration
@@ -497,7 +499,7 @@ def edit_note(note):
         end()
         sys.exit(0)
 
-    database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami(), Options["Trainee"])
+    database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami(), bool(Options["Trainee"]))
 
 ################################################################################
 
@@ -676,7 +678,7 @@ def do_new():
             print "W: [!] marked entries must be fixed before package can be processed."
         if note:
             print "W: note must be removed before package can be processed."
-            prompt += "Remove note, "
+            prompt += "RemOve all notes, Remove note, "
 
         prompt += "Edit overrides, Check, Manual reject, Note edit, Prod, [S]kip, Quit ?"
 
@@ -713,6 +715,10 @@ def do_new():
             confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
             if confirm == "y":
                 database.delete_new_comments(changes.get("source"), changes.get("version"))
+        elif answer == 'O' and not Options["Trainee"]:
+            confirm = utils.our_raw_input("Really clear all notes (y/N)? ").lower()
+            if confirm == "y":
+                database.delete_all_new_comments(changes.get("source"))
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
@@ -765,9 +771,9 @@ def init():
 
     if not Options["No-Action"]:
         try:
-            Logger = Upload.Logger = logging.Logger(Cnf, "process-new")
+            Logger = Upload.Logger = daklog.Logger(Cnf, "process-new")
         except CantOpenError, e:
-            Options["Trainee"] = True
+            Options["Trainee"] = "True"
 
     projectB = Upload.projectB
 
@@ -1017,8 +1023,8 @@ def do_pkg(changes_file):
 ################################################################################
 
 def end():
-    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"