X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=43bd1bd0271df9c1d1d74e76e53b7dca2259a348;hb=64521b7f5720cd25132e3feed4b15e99e35790db;hp=70f92fdd52464718331cc8adceef09fba6ff1538;hpb=1dc886cd1b773341c458e169953dc54301e1ca1d;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 70f92fdd..43bd1bd0 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -26,16 +26,9 @@ function debug () {
 }
 
 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
+        ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often
     fi
     rm -f "${LOCK_BUILDD}"
 }
@@ -49,6 +42,15 @@ function make_buildd_dir () {
     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.
@@ -64,6 +66,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