process-new

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index e3388d25597654893125d0b55ee957621706c4e2..6cbbccff5090fb7f9fd9f39fb6f52c8232228cb3 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -225,7 +225,7 @@ def sort_changes(changes_files):
             mtime = os.stat(d["filename"])[stat.ST_MTIME]
             if mtime < oldest:
                 oldest = mtime
-            have_note += (database.has_new_comment(d["source"], d["version"]))
+            have_note += (database.has_new_comment(d["source"], d["version"], True))
         per_source[source]["oldest"] = oldest
         if not have_note:
             per_source[source]["note_state"] = 0; # none
@@ -496,7 +496,8 @@ def edit_note(note):
     elif answer == 'Q':
         end()
         sys.exit(0)
-    database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami())
+
+    database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami(), Options["Trainee"])
 
 ################################################################################
 
@@ -766,7 +767,7 @@ def init():
         try:
             Logger = Upload.Logger = logging.Logger(Cnf, "process-new")
         except CantOpenError, e:
-            Options["Trainee"] = "Oh yes"
+            Options["Trainee"] = True
 
     projectB = Upload.projectB
 
@@ -935,7 +936,7 @@ def do_accept_stableupdate(suite, q):
         elif is_source_in_queue_dir(Cnf["Dir::Queue::Newstage"]):
             # It's in newstage.  Accept into the holding area
             print "Binary-only upload, source in newstage."
-            move_to_holding(suite, queue_dir)
+            _accept()
         else:
             # No case applicable.  Bail out.  Return will cause the upload
             # to be skipped.