Merge branch 'master' into security

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index dec339af60c310940bb09febd921c8f503b048cd..237fcc73725ebba5b383c4b1483547cd162dd143 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -332,7 +332,7 @@ def prod_maintainer(notes, upload):
 
 ################################################################################
 
-def edit_note(note, upload, session):
+def edit_note(note, upload, session, trainee=False):
     # Write the current data to a temporary file
     (fd, temp_filename) = utils.temp_filename()
     editor = os.environ.get("EDITOR","vi")
@@ -364,7 +364,7 @@ def edit_note(note, upload, session):
     comment.version = upload.pkg.changes["version"]
     comment.comment = newnote
     comment.author  = utils.whoami()
-    comment.trainee = bool(Options["Trainee"])
+    comment.trainee = trainee
     session.add(comment)
     session.commit()