Make the wnpp parse more robust for missing files

[dak.git] / dak / process_policy.py

diff --git a/dak/process_policy.py b/dak/process_policy.py
index c23a3cdc24e7a186d46ef2a1d2e097ebd85d5995..d1377b97097debe4c19be69f91eaa566d8527175 100755 (executable)
--- a/dak/process_policy.py
+++ b/dak/process_policy.py
@@ -79,9 +79,10 @@ def comment_accept(changes_file, srcqueue, comments, session):
 
     if not Options["No-Action"]:
         destqueue = get_policy_queue('newstage', session)
-       if changes_to_queue(u, srcqueue, destqueue, session):
+        if changes_to_queue(u, srcqueue, destqueue, session):
+            print "  ACCEPT"
             Logger.log(["Policy Queue ACCEPT: %s:  %s" % (srcqueue.queue_name, u.pkg.changes_file)])
-       else:
+        else:
             print "E: Failed to migrate %s" % u.pkg.changes_file
 
 ################################################################################
@@ -94,10 +95,19 @@ def comment_reject(changes_file, srcqueue, comments, session):
 
     u.rejects.append(comments)
 
+    cnf = Config()
+    bcc = "X-DAK: dak process-policy"
+    if cnf.has_key("Dinstall::Bcc"):
+        u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"])
+    else:
+        u.Subst["__BCC__"] = bcc
+
     if not Options["No-Action"]:
         u.do_reject(manual=0, reject_message='\n'.join(u.rejects))
         u.pkg.remove_known_changes(session=session)
+        session.commit()
 
+        print "  REJECT"
         Logger.log(["Policy Queue REJECT: %s:  %s" % (srcqueue.queue_name, u.pkg.changes_file)])