Fix note display in Prod and Manual reject mode

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 6f01ba6cbb0ea22472b2213ab35a9270008795ba..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'
@@ -132,8 +131,7 @@ def prod_maintainer(notes, upload):
     if answer == 'A':
         return
     elif answer == 'Q':
-        end()
-        sys.exit(0)
+        return 0
     # Otherwise, do the proding...
     user_email_address = utils.whoami() + " <%s>" % (
         cnf["Dinstall::MyAdminAddress"])
@@ -186,8 +184,7 @@ def edit_note(note, upload, session, trainee=False):
     if answer == 'A':
         return
     elif answer == 'Q':
-        end()
-        sys.exit(0)
+        return 0
 
     comment = NewComment()
     comment.package = upload.changes.source