X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=bc3248c7470dd6cad1b5f8f44398d5bfcffccc6d;hb=ddeee80a2f3389f89fb5ee1d7ecc5e36a68279d7;hp=c9363bc8d1f294669533cbabf312e53a17fb3059;hpb=32063f01897651692754f8a2a0f189fa7c1f3c64;p=dak.git diff --git a/config/debian/common b/config/debian/common index c9363bc8..bc3248c7 100644 --- a/config/debian/common +++ b/config/debian/common @@ -83,6 +83,7 @@ function wbtrigger() { # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { # We generate straight into the static mirror location for incoming + log "Preparing buildd area" dak manage-build-queues -a dak generate-packages-sources2 -a build-queues dak generate-releases -a build-queues >/dev/null @@ -91,6 +92,7 @@ function make_buildd_dir () { echo "
Last updated: `date -u`
" > ${incoming}/web/README.html # Tell the mirrors that we've updated + log "Pushing static for incoming.d.o" chronic /usr/local/bin/static-update-component incoming.debian.org } @@ -144,18 +146,21 @@ function backports_policy() { function do_unchecked () { cd $unchecked - changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) + changes=$(find . -maxdepth 1 -mindepth 1 -type f \( -name \*.changes -o -name \*.dak-commands \) | sed -e "s,./,," | xargs) report=$queuedir/REPORT timestamp=$(date "+%Y-%m-%d %H:%M") - UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""} - - echo "$timestamp": ${changes:-"Nothing to do"} >> $report - dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report - dak process-commands -d "$unchecked" >> $report if [ ! -z "$changes" ]; then + log "Processing files ${changes}" + echo "${timestamp}: ${changes}" >> $report + dak process-upload -a -d "$unchecked" >> $report + dak process-commands -d "$unchecked" >> $report + sync_debbugs do_buildd + else + log "Nothing to do" + echo "Nothing to do" >> ${report} fi } @@ -164,13 +169,16 @@ function do_new () { log "Doing NEW processing" (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" -a "From: Debian FTP Masters