X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=8aa05a48a0e6a1097ac853244c30ce3d231cbf49;hb=aa05503ac04f3e6cb22c22ab9b75d72abe4a4ca1;hp=4a0d6cb997475e289117e1c2a09e28159cd436b1;hpb=fa61e804d27f286dd5ad60f9212495a5972916f0;p=dak.git diff --git a/config/debian/common b/config/debian/common index 4a0d6cb9..8aa05a48 100644 --- a/config/debian/common +++ b/config/debian/common @@ -25,9 +25,24 @@ function debug () { fi } +function wbtrigger() { + MODE=${1:-"often"} + SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" + if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then + if [ "x${MODE}x" = "xdailyx" ]; then + ssh ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org + elif [ "x${MODE}x" = "xoftenx" ]; then + ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often + else + log_error "Unknown wb trigger mode called" + fi + fi + rm -f "${LOCK_BUILDD}" +} + # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { - dak manage-build-queues -v buildd + dak manage-build-queues -a cd ${incoming} mkdir -p tree/${STAMP} @@ -49,6 +64,19 @@ function do_unchecked () { dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report } +# Do the newstage processing, in case we have files. +function do_newstage () { + cd $newstage + + changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | 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 in newstage"} >> $report + dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$newstage" >> $report +} + function sync_debbugs () { # sync with debbugs echo "--" >> $report