Fix note display in Prod and Manual reject mode

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index 583143bb6f41e5381865218740e58739bf4a3da9..afd03d23c8283ee5410ac4cc4ab76f83def95c38 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -534,7 +534,7 @@ def do_new(upload, upload_copy, handler, session):
             missing = edit_overrides (missing, upload, session)
         elif answer == 'M' and not Options["Trainee"]:
             reason = Options.get('Manual-Reject', '') + "\n"
-            reason = reason + "\n".join([n.comment for n in get_new_comments(upload.changes.source, session=session)])
+            reason = reason + "\n\n=====\n\n".join([n.comment for n in get_new_comments(upload.changes.source, session=session)])
             reason = get_reject_reason(reason)
             if reason is not None:
                 Logger.log(["NEW REJECT", upload.changes.changesname])

diff --git a/daklib/queue.py b/daklib/queue.py
index e81614c3e742e89a2b1b8c6538e8f65a712bcbe5..547972ed0932b6af669e836e96a61dbfcbdf100d 100644 (file)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -108,8 +108,7 @@ def prod_maintainer(notes, upload):
     # Here we prepare an editor and get them ready to prod...
     (fd, temp_filename) = utils.temp_filename()
     temp_file = os.fdopen(fd, 'w')
-    for note in notes:
-        temp_file.write(note.comment)
+    temp_file.write("\n\n=====\n\n".join([note.comment for note in notes]))
     temp_file.close()
     editor = os.environ.get("EDITOR","vi")
     answer = 'E'