[dak/master] Fix note display in Prod and Manual reject mode

[Luca Falavigna <dktrkranz@debian.org>]

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
---
 dak/process_new.py |    2 +-
 daklib/queue.py    |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dak/process_new.py b/dak/process_new.py
index 583143b..afd03d2 100755
--- 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 e81614c..547972e 100644
--- 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'
-- 
1.7.2.5