X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=060fa236964d539dbc2aa7ec5b49e7929f0b6513;hb=ed2d1928a25b95eb69616cf10bedd02c40740d8d;hp=9f7694d805464a13913030ceb4f36432b3dd3c64;hpb=cc7073896e638b1621bd5ef51f782988eb4380fc;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index 9f7694d8..060fa236 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -95,6 +95,8 @@ def recheck(upload, session): if answer == 'R': upload.do_reject(manual=0, reject_message='\n'.join(upload.rejects)) + upload.pkg.remove_known_changes(session=session) + session.commit() return 0 elif answer == 'S': return 0 @@ -675,11 +677,12 @@ 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)) + notes=get_new_comments(changes.get("source", ""), session=session)) if not aborted: + upload.pkg.remove_known_changes(session=session) + session.commit() Logger.log(["NEW REJECT: %s" % (upload.pkg.changes_file)]) done = 1 elif answer == 'N': @@ -769,6 +772,8 @@ def do_byhand(upload, session): elif answer == 'M': Logger.log(["BYHAND REJECT: %s" % (upload.pkg.changes_file)]) upload.do_reject(manual=1, reject_message=Options["Manual-Reject"]) + upload.pkg.remove_known_changes(session=session) + session.commit() done = 1 elif answer == 'S': done = 1