From 6ca53bc55ff6d8bda634c525d7967e1af1ab6bd0 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Tue, 13 Nov 2012 20:01:24 +0100 Subject: [PATCH] config/debian-security/cron.unchecked: call process-upload before process-policy This saves one run for uploads that are automatically accepted from the policy queues (eg. buildd uploads for an already accepted source). --- config/debian-security/cron.unchecked | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index 784ac371..a38270f8 100755 --- a/config/debian-security/cron.unchecked +++ b/config/debian-security/cron.unchecked @@ -28,15 +28,6 @@ if ! lockfile -r8 "$LOCKFILE"; then fi trap cleanup EXIT -for queue in embargoed unembargoed; do - echo "$timestamp: processing ${queue}" >> ${report} - dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" team@security.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org -done -accepted=$(find ${queuedir}/accepted -type f -name "*.changes") -if [ -n "${accepted}" ]; then - dopolicy=true -fi - cd $unchecked changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) if [ -n "$changes" ]; then @@ -47,13 +38,21 @@ fi cd $disembargo changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) - if [ -n "$changes" ]; then doanything=true echo "$timestamp": ${changes:-"Nothing to do in disembargo"} >> $reportdis dak process-upload -a -d "$disembargo" >> $reportdis fi +for queue in embargoed unembargoed; do + echo "$timestamp: processing ${queue}" >> ${report} + dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" team@security.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org +done +accepted=$(find ${queuedir}/accepted -type f -name "*.changes") +if [ -n "${accepted}" ]; then + dopolicy=true +fi + # sync accepted files to ftpmaster cd ${base} find ${queuedir}/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' + -- 2.39.5