X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fhourly.functions;h=dd13ba77e1a894cd022dd886c8c99e38f9eda449;hb=c7c3004d7fb00f8d419178ea982d30ab2c61b681;hp=3e809fafece0dda5a903621e6bd6c5a8d1519c6d;hpb=9639afdb34ea7c5fdaf62e05a78ca0aab288f6de;p=dak.git

diff --git a/config/debian/hourly.functions b/config/debian/hourly.functions
index 3e809faf..dd13ba77 100644
--- a/config/debian/hourly.functions
+++ b/config/debian/hourly.functions
@@ -6,20 +6,24 @@ function importusers() {
 
 function newoverview() {
     # do not run show-new and other stuff in parallel
-    if lockfile -r16 $LOCK_UNCHECKED 2> /dev/null; then
+    if lockfile -r16 ${LOCK_UNCHECKED} 2> /dev/null; then
         TMPFILES="${TMPFILES} ${LOCK_UNCHECKED}"
         do_new
+        log "Output html for packages in NEW"
         dak show-new > /dev/null || true
+        cleantempfiles
     fi
-    cleantempfiles
 }
 
 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
-    dak queue-report -8 -d new,byhand,stable-new,oldstable-new,backports-new -r $webdir/stat
+    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
-    dak graph -n new,byhand,stable-new,oldstable-new,deferred -r ${webdir}/stat -i ${webdir}/stat -x $scriptsdir/rrd-release-freeze-dates
+    log "Graphs about the queues"
+    dak graph -n new,byhand,stable-new,oldstable-new,deferred,backports-new -r ${webdir}/stat -i ${webdir}/stat -x ${scriptsdir}/rrd-release-freeze-dates
 }
 
 function removalstxt() {
@@ -31,12 +35,14 @@ function removalstxt() {
 }
 
 function rss() {
-    $base/dak/tools/queue_rss.py -q $queuedir/new -o ${webdir}/rss/ -d $base/misc -l $base/log/
-    $base/dak/tools/removals.pl $configdir/removalsrss.rc > ${webdir}/rss/removals.rss
+    log "NEW RSS feed"
+    ${base}/dak/tools/queue_rss.py -q ${queuedir}/new -o ${webdir}/rss/ -d ${base}/misc -l ${base}/log/
+    log "Removals RSS feed"
+    ${base}/dak/tools/removals.pl ${configdir}/removalsrss.rc > ${webdir}/rss/removals.rss
 }
 
 function gen_di() {
-    $scriptsdir/generate-d-i
+    ${scriptsdir}/generate-d-i
 }
 
 function backportsacl() {
@@ -48,8 +54,7 @@ function backportsacl() {
 
 # do the buildd key updates
 function builddautosigning() {
-    BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
-    TMPFILES="${TMPFILES} ${BUILDDFUN}"
+    BUILDDFUN=$( gettempfile )
     exec >> "${BUILDDFUN}" 2>&1
     ${scriptsdir}/buildd-remove-keys
     ${scriptsdir}/buildd-add-keys
@@ -61,7 +66,7 @@ function builddautosigning() {
     exec >>/dev/null 2>&1
 
     DATE=$(date -Is)
-    cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] 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}"
 }