add stupid hack to work around apt-pkg's config handling

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 98ad2bd3c05e0aa217f63b50d421aa2d834c9e0b..a7da65c3c874434228fbd4588bb816009a6d41ad 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(), bool(Options["Trainee"]))
 
 ################################################################################
 
@@ -680,14 +681,7 @@ def do_new():
         prompt += "Edit overrides, Check, Manual reject, Note edit, Prod, [S]kip, Quit ?"
 
         while prompt.find(answer) == -1:
-            try:
-                answer = utils.our_raw_input(prompt)
-            except IOError, e:
-                if e.errno == errno.EPIPE:
-                    utils.warn("[process_new] Caught EPIPE; skipping.")
-                    pass
-                else:
-                    raise
+            answer = utils.our_raw_input(prompt)
             m = re_default_answer.search(prompt)
             if answer == "":
                 answer = m.group(1)
@@ -773,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
 
@@ -939,6 +933,10 @@ def do_accept_stableupdate(suite, q):
             # pretty soon.
             print "Binary-only upload, source in new."
             move_to_holding(suite, queue_dir)
+        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."
+            _accept()
         else:
             # No case applicable.  Bail out.  Return will cause the upload
             # to be skipped.