]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote-tracking branch 'ansgar/pu/multiarchive-2'
authorJoerg Jaspert <joerg@debian.org>
Sun, 12 Aug 2012 10:18:15 +0000 (12:18 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 12 Aug 2012 10:18:15 +0000 (12:18 +0200)
* ansgar/pu/multiarchive-2:
  config/debian/common: also process BYHAND
  dak/process_new.py: auto-accept uploads if we have all overrides

Signed-off-by: Joerg Jaspert <joerg@debian.org>
config/debian/common
dak/process_new.py

index 18ca14bfb29ce5406d9904d2eee85e16008a6cdf..a785db5824780f2dd80d612b529e19de77ae29c7 100644 (file)
@@ -126,7 +126,7 @@ function do_new () {
     if [ "${PROGRAM}" = "dinstall" ]; then
        log "Doing NEW processing"
     fi
-    dak process-policy new | mail -a "X-Debian: DAK" -e -s "NEW processing" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
     dak clean-suites -a new
 }
 
index 0d1307693ab9915dc17b372e56877d82b97717de..afeb06437ac0998cdc1e2e7bb1fd9ca404818856 100755 (executable)
@@ -485,6 +485,7 @@ def do_new(upload, upload_copy, handler, session):
         if not has_unprocessed_byhand and not broken and not note:
             if len(missing) == 0:
                 prompt = "Accept, "
+                answer = 'A'
             else:
                 prompt = "Add overrides, "
         if broken: