From ad9ad0e05e5c952793c36468406b56793a06abfa Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 13 Dec 2010 23:23:29 +0100 Subject: [PATCH] only run the archive update when we actually had changes in the archive Signed-off-by: Joerg Jaspert Signed-off-by: Joerg Jaspert --- config/debian-security/cron.unchecked | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index 89baf28a..4f24dd34 100755 --- a/config/debian-security/cron.unchecked +++ b/config/debian-security/cron.unchecked @@ -14,6 +14,7 @@ report=$queuedir/REPORT reportdis=$queuedir/REPORT.disembargo timestamp=$(date "+%Y-%m-%d %H:%M") doanything=false +dopolicy=false # So first we should go and see if any process-policy action is done dak process-policy embargo | mail -a "X-Debian: DAK" -e -s "Automatically accepted from embargoed" team@security.debian.org -- -F "Debian FTP Masters" -f ftonaster@ftp-master.debian.org @@ -26,6 +27,7 @@ dak process-policy disembargo | mail -a "X-Debian: DAK" -e -s "Automatically acc cd $newstage changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) if [ -n "$changes" ]; then + dopolicy=true echo "$timestamp": ${changes:-"Nothing to do in newstage"} >> $report rsync -a -q $newstage/. /srv/queued/ftpmaster/. dak process-upload -a -d "$newstage" >> $report @@ -53,13 +55,16 @@ if ! $doanything; then exit 0 fi -dak dominate -dak generate-filelist -cd $configdir -$configdir/map.sh -apt-ftparchive generate apt.conf -dak generate-releases -/srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh -sudo -u archvsync -H /home/archvsync/signal_security +if [ "x${dopolicy}x" = "xtruex" ]; then + # We had something approved from a policy queue, push out new archive + dak dominate + dak generate-filelist + cd $configdir + $configdir/map.sh + apt-ftparchive generate apt.conf + dak generate-releases + /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh + sudo -u archvsync -H /home/archvsync/signal_security +fi $masterdir/cron.buildd -- 2.39.5