X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=2c0f452fcd835acfd1a4f4406a5636474394476a;hb=48e5e5ee12f7c36e3272ec8d3dc0d6c43625d984;hp=7b02a8d9f4e01ba3218a3b4334aae0fb88204877;hpb=ed5d2fd01bb5201bb991dbeee87bccf04397c320;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index 7b02a8d9..2c0f452f 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -469,19 +469,14 @@ def edit_overrides (new):
 def edit_note(note):
     # Write the current data to a temporary file
     (fd, temp_filename) = utils.temp_filename()
-    temp_file = os.fdopen(fd, 'w')
-    if len(note) > 0:
-        for line in note:
-            temp_file.write(line)
-    temp_file.close()
     editor = os.environ.get("EDITOR","vi")
     answer = 'E'
     while answer == 'E':
         os.system("%s %s" % (editor, temp_filename))
         temp_file = utils.open_file(temp_filename)
-        note = temp_file.read().rstrip()
+        newnote = temp_file.read().rstrip()
         temp_file.close()
-        print "Note:"
+        print "New Note:"
         print utils.prefix_multi_line_string(note,"  ")
         prompt = "[D]one, Edit, Abandon, Quit ?"
         answer = "XXX"
@@ -689,14 +684,16 @@ def do_new():
         elif answer == 'E' and not Options["Trainee"]:
             new = edit_overrides (new)
         elif answer == 'M' and not Options["Trainee"]:
-            aborted = Upload.do_reject(1, Options["Manual-Reject"])
+            aborted = Upload.do_reject(manual=1,
+                                       reject_message=Options["Manual-Reject"],
+                                       note=database.get_new_comments(changes.get("source", "")))
             if not aborted:
                 os.unlink(Upload.pkg.changes_file[:-8]+".dak")
                 done = 1
         elif answer == 'N':
             edit_note(database.get_new_comments(changes.get("source", "")))
         elif answer == 'P' and not Options["Trainee"]:
-            prod_maintainer()
+            prod_maintainer(database.get_new_comments(changes.get("source", "")))
         elif answer == 'R':
             confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
             if confirm == "y":
@@ -983,7 +980,7 @@ def end():
         sys.stderr.write("Accepted %d package %s, %s.\n" % (accept_count, sets, utils.size_type(int(accept_bytes))))
         Logger.log(["total",accept_count,accept_bytes])
 
-    if not Options["No-Action"]:
+    if not Options["No-Action"] and not Options["Trainee"]::
         Logger.close()
 
 ################################################################################