X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=e796b89c2a7e5646223945840a6bbdfdcacca8ff;hb=f425ea1ef661dd2ac005317fda58413f9ed69848;hp=4a0d6cb997475e289117e1c2a09e28159cd436b1;hpb=fa61e804d27f286dd5ad60f9212495a5972916f0;p=dak.git diff --git a/config/debian/common b/config/debian/common index 4a0d6cb9..e796b89c 100644 --- a/config/debian/common +++ b/config/debian/common @@ -1,3 +1,4 @@ +# -*- mode:sh -*- # log something (basically echo it together with a timestamp) # # Set $PROGRAM to a string to have it added to the output. @@ -25,15 +26,32 @@ function debug () { fi } +function wbtrigger() { + SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" + if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then + ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often + 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} cp -al ${incoming}/buildd/. tree/${STAMP}/ ln -sfT tree/${STAMP} ${incoming}/builddweb find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + + for dist in experimental + do + cd ${incoming}/dists/${dist} + mkdir -p tree/${STAMP} + cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ + ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current + find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + done } # Do the unchecked processing, in case we have files. @@ -49,6 +67,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