Fix note display in Prod and Manual reject mode

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 0b71541bc0f8ea72bb4be1c5899a47cd549a8c76..afd03d23c8283ee5410ac4cc4ab76f83def95c38 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -457,7 +457,6 @@ def get_reject_reason(reason=''):
 ################################################################################
 
 def do_new(upload, upload_copy, handler, session):
-    print "NEW\n"
     cnf = Config()
 
     run_user_inspect_command(upload, upload_copy)
@@ -475,6 +474,9 @@ def do_new(upload, upload_copy, handler, session):
         #if len(byhand) == 0 and len(missing) == 0:
         #    break
 
+        if missing:
+            print "NEW\n"
+
         answer = "XXX"
         if Options["No-Action"] or Options["Automatic"]:
             answer = 'S'
@@ -532,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])
@@ -568,6 +570,9 @@ def do_new(upload, upload_copy, handler, session):
             end()
             sys.exit(0)
 
+        if handler.get_action():
+            print "PENDING %s\n" % handler.get_action()
+
 ################################################################################
 ################################################################################
 ################################################################################
@@ -668,6 +673,7 @@ def do_pkg(upload, session):
        with UploadCopy(upload) as upload_copy:
         handler = PolicyQueueUploadHandler(upload, session)
         if handler.get_action() is not None:
+            print "PENDING %s\n" % handler.get_action()
             return
 
         do_new(upload, upload_copy, handler, session)