make sure cdpath isnt ever set in scripts

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index 212d84ad4b07adc456e76580bebcf9a74b779093..a18433dac49da93f113072ac84bfb426e8a18eed 100644 (file)
--- 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}"
 }
@@ -44,20 +38,14 @@ function wbtrigger() {
 function make_buildd_dir () {
     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
+    for dist in $(ls -1 ${incoming}/dists/); 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.
@@ -89,6 +77,10 @@ function do_newstage () {
 function sync_debbugs () {
     # sync with debbugs
     echo "--" >> $report
+    timestamp=$(date "+%Y-%m-%d-%H:%M")
+    mkdir -p $queuedir/bts_version_track_archive/${timestamp}
+    rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp}
+    rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${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)