Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 185157ac27290002961ebd4693e9c50fa94ff1de..e052af49a1909ee1d7f249251dffab4afa9d3be2 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -674,6 +674,7 @@ def do_new(upload, session):
         elif answer == 'E' and not Options["Trainee"]:
             new = edit_overrides (new, upload, session)
         elif answer == 'M' and not Options["Trainee"]:
+            upload.pkg.remove_known_changes()
             aborted = upload.do_reject(manual=1,
                                        reject_message=Options["Manual-Reject"],
                                        note=get_new_comments(changes.get("source", ""), session=session))
@@ -820,7 +821,7 @@ def _accept(upload):
     if Options["No-Action"]:
         return
     (summary, short_summary) = upload.build_summaries()
-    upload.accept(summary, short_summary, targetdir=Config()["Dir::Queue::Newstage"])
+    upload.accept(summary, short_summary, targetqueue)
     os.unlink(upload.pkg.changes_file[:-8]+".dak")
 
 def do_accept(upload):
@@ -831,7 +832,7 @@ def do_accept(upload):
 
         if cnf.FindB("Dinstall::SecurityQueueHandling"):
             upload.dump_vars(cnf["Dir::Queue::Embargoed"])
-            upload.move_to_dir(cnf["Dir::Queue::Embargoed"])
+            upload.move_to_queue(get_policy_queue('embargoed'))
             upload.queue_build("embargoed", cnf["Dir::Queue::Embargoed"])
             # Check for override disparities
             upload.Subst["__SUMMARY__"] = summary
@@ -897,6 +898,10 @@ def end():
 def main():
     global Options, Logger, Sections, Priorities
 
+    print "NO NEW PROCESSING CURRENTLY AVAILABLE"
+    print "(Go and do something more interesting)"
+    sys.exit(0)
+
     cnf = Config()
     session = DBConn().session()