* process_new.py: When rejecting from the p-u-new or o-p-u-new

	holding queues, don't worry if dak has its own reasons for
	rejecting the package as well as the SRMs.

diff --git a/ChangeLog b/ChangeLog
index 469a418c8089b0df7cbd99606c301c81aedf5fe7..6da9275979306cceb67410fdb13d63fbd320c60a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
        * examine_package.py: Summarise duplicate copyright file entries
        (same md5sum) with a reference to the previous instance, rather
        than repeating them.
+       * process_new.py: When rejecting from the p-u-new or o-p-u-new
+       holding queues, don't worry if dak has its own reasons for
+       rejecting the package as well as the SRMs.
 
 2007-06-19  Anthony Towns  <ajt@debian.org>
 

diff --git a/dak/process_new.py b/dak/process_new.py
index 8d9ecd60b44bc554a0d5e9b925fcea2c1485f503..8518398d37fc46f77fbc48fcdffd3ef89b22d694 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -970,7 +970,7 @@ def comment_accept(changes_file, comments):
     files = Upload.pkg.files
 
     if not recheck():
-        return
+        return # dak wants to REJECT, crap
 
     (new, byhand) = check_status(files)
     if not new and not byhand:
@@ -986,7 +986,7 @@ def comment_reject(changes_file, comments):
     files = Upload.pkg.files
 
     if not recheck():
-        return
+        pass # dak has its own reasons to reject as well, which is fine
 
     reject(comments)
     print "REJECT\n" + reject_message,