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

diff --git a/config/debian/common b/config/debian/common
index d7f8e1f6..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
@@ -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