Generate new.html stuff atomic

[dak.git] / config / debian / hourly.functions

diff --git a/config/debian/hourly.functions b/config/debian/hourly.functions
index ec713d8fd72a12b44bab3c6d9b1581afdd323b2c..ccedc5bc4ffc926e66f041fce019d108000098ba 100644 (file)
--- a/config/debian/hourly.functions
+++ b/config/debian/hourly.functions
@@ -15,10 +15,20 @@ function newoverview() {
     fi
 }
 
+function do_report() {
+    local target=${1:-"${webdir}/new.html"}
+    local opts=${2:-"-n"}
+    local TMPOUT=$( mktemp -p "${TMPDIR}" reportout.XXXXXX )
+    TMPFILES="${TMPFILES} ${TMPOUT}"
+    dak queue-report ${opts} > ${TMPOUT}
+    chmod 644 ${TMPOUT}
+    mv -f ${TMPOUT} ${target}
+}
+
 function queuereport() {
     log "Creating queue reports, new/backports-new, 822 format"
-    dak queue-report -n > ${webdir}/new.html
-    dak queue-report -n -d backports-new,backports-policy > ${webdir}/backports-new.html
+    do_report
+    do_report ${webdir}/backports-new.html "-n -d backports-new,backports-policy"
     dak queue-report -8 -d new,byhand,stable-new,oldstable-new,backports-new -r ${webdir}/stat
     log "Deferred queue overview"
     sudo -u dak-unpriv dak show-deferred -r ${webdir}/stat > ${webdir}/deferred.html
@@ -66,7 +76,7 @@ function builddautosigning() {
     exec >>/dev/null 2>&1
 
     DATE=$(date -Is)
-    cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[${HOSTNAME}] Buildd key changes ${DATE}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" buildd-keys@ftp-master.debian.org
+    mail -a "X-Debian: DAK" -e -s "[${HOSTNAME}] Buildd key changes ${DATE}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" buildd-keys@ftp-master.debian.org < "${BUILDDFUN}"
 
     rm -f "${BUILDDFUN}"
 }