From cff085636fc6e17475eb823eea2f9aa6679358e1 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sun, 4 Nov 2012 17:52:49 +0100 Subject: [PATCH] config/debian-security/cron.unchecked: just run process-policy to see if there were files to process --- config/debian-security/cron.unchecked | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index e234e33b..bd750d4a 100755 --- a/config/debian-security/cron.unchecked +++ b/config/debian-security/cron.unchecked @@ -37,13 +37,11 @@ fi trap cleanup EXIT for queue in embargoed; do - cd ${queuedir}/${queue}/COMMENTS - comments=$(find . -maxdepth 1 -mindepth 1 -type f '(' -name "ACCEPT.*.changes" -o -name "REJECT.*.changes" ')' | sed -e "s,./,," | xargs) - if [ -n "$comments" ]; then + echo "$timestamp: processing ${queue}" >> ${report} + dak process-policy ${queue} >> ${report} + accepted=$(find ${queuedir}/accepted -type f -name "*.changes") + if [ -n "${accepted}" ]; then dopolicy=true - echo "$timestamp": ${comments:-"Nothing to do for ${queue}"} >> $report - dak process-policy ${queue} >> ${report} - find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' + fi done @@ -103,6 +101,7 @@ done if [ "x${dopolicy}x" = "xtruex" ]; then # We had something approved from a policy queue, push out new archive + find /srv/security-master.debian.org/queue/accepted -type f -exec mv -t /srv/queued/ftpmaster '{}' + dak dominate #dak generate-filelist cd $configdir -- 2.39.5