Merge branch 'process-new' into merge

* process-new:
  p-n
  p-n
  p-n
  p-n

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index 7db60f87ff7f90ef266cd865395940556868b57e..e76fc0c74b9fa52e385d8fd7ec2e075746991194 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -95,7 +95,6 @@ def recheck(upload, session):
 
         if answer == 'R':
             upload.do_reject(manual=0, reject_message='\n'.join(upload.rejects))
-            os.unlink(upload.pkg.changes_file[:-8]+".dak")
             return 0
         elif answer == 'S':
             return 0
@@ -682,7 +681,6 @@ def do_new(upload, session):
                                        note=get_new_comments(changes.get("source", ""), session=session))
             if not aborted:
                 Logger.log(["NEW REJECT: %s" % (upload.pkg.changes_file)])
-                os.unlink(upload.pkg.changes_file[:-8]+".dak")
                 done = 1
         elif answer == 'N':
             edit_note(get_new_comments(changes.get("source", ""), session=session),
@@ -771,7 +769,6 @@ 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"])
-            os.unlink(upload.pkg.changes_file[:-8]+".dak")
             done = 1
         elif answer == 'S':
             done = 1