debianqueued: open ftp connection when trying to upload .dak-commands

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index e81614c3e742e89a2b1b8c6538e8f65a712bcbe5..f2dc55a0d91ae5c9ccc2c8a6ce25f89f329bb57f 100644 (file)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -104,12 +104,12 @@ def check_valid(overrides, session):
 def prod_maintainer(notes, upload):
     cnf = Config()
     changes = upload.changes
+    whitelists = [ upload.target_suite.mail_whitelist ]
 
     # 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'
@@ -155,7 +155,7 @@ def prod_maintainer(notes, upload):
         Subst,cnf["Dir::Templates"]+"/process-new.prod")
 
     # Send the prod mail
-    utils.send_mail(prod_mail_message)
+    utils.send_mail(prod_mail_message, whitelists=whitelists)
 
     print "Sent prodding message"
 
@@ -188,6 +188,7 @@ def edit_note(note, upload, session, trainee=False):
         return 0
 
     comment = NewComment()
+    comment.policy_queue = upload.policy_queue
     comment.package = upload.changes.source
     comment.version = upload.changes.version
     comment.comment = newnote