X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=8aa05a48a0e6a1097ac853244c30ce3d231cbf49;hb=aa05503ac04f3e6cb22c22ab9b75d72abe4a4ca1;hp=d0ba21b0fcb93e109b986084b996d2d0931509b2;hpb=102a1ccb21dd87678c99318fb26154bae3104e12;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index d0ba21b0..8aa05a48 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -30,7 +30,7 @@ function wbtrigger() {
     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 -o ${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
+            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
@@ -42,7 +42,7 @@ function wbtrigger() {
 
 # 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}
@@ -64,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