removing known_changes now works, and inserting has a better chance of working

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index ad67dc5c43970ca3dfa94d9e960528ad8c2e35fd..269971d0242ce83e5859dc5c14b723cf1f2f435a 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -704,6 +704,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))
@@ -800,7 +801,6 @@ def do_byhand(upload, session):
             Logger.log(["BYHAND REJECT: %s" % (upload.pkg.changes_file)])
             upload.do_reject(manual=1, reject_message=Options["Manual-Reject"])
             os.unlink(upload.pkg.changes_file[:-8]+".dak")
-            upload.pkg.remove_known_changes()
             done = 1
         elif answer == 'S':
             done = 1