[JJ, r=JT] ignore stderr when finding copyright with dpkg-deb

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 8d9ecd60b44bc554a0d5e9b925fcea2c1485f503..b7010532e5c358141049efb22085936526f7e4d9 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -94,7 +94,7 @@ def recheck():
             (reject_msg, is_in_incoming) = Upload.check_dsc_against_db(file)
             reject(reject_msg)
 
-    if reject_message:
+    if reject_message.find("Rejected") != -1:
         answer = "XXX"
         if Options["No-Action"] or Options["Automatic"]:
             answer = 'S'
@@ -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,