X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=6730889db1805c81f23b7108f7896d089db35a83;hb=e54669f1fd985f194218658e9515038a073690e8;hp=212d84ad4b07adc456e76580bebcf9a74b779093;hpb=ec5b13fa418fad2a5b85070718a4c771fdc43f8a;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 212d84ad..6730889d 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.
@@ -26,16 +27,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}"
 }
@@ -89,6 +83,10 @@ function do_newstage () {
 function sync_debbugs () {
     # sync with debbugs
     echo "--" >> $report
+    timestamp=$(date "+%Y-%m-%d-%H:%M")
+    mkdir -p $queuedir/${timestamp}
+    rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp}
+    rmdir --ignore-fail-on-non-empty $queuedir/${timestamp} # remove if empty.
     rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
     NOW=$(date +%s)
     TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)