X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=a18433dac49da93f113072ac84bfb426e8a18eed;hb=dec160172b136c712dddf2c942ee03a52e8e0b88;hp=913e0de84ed1be14e1c2a54a71a36fa91c77051f;hpb=dd9c0cd2026a72916a089739d4211a65ce6e12d5;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 913e0de8..a18433da 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -38,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.
@@ -83,11 +77,10 @@ function do_newstage () {
 function sync_debbugs () {
     # sync with debbugs
     echo "--" >> $report
-    if [ -f "$queuedir/bts_version_track/*.versions" ]; then
-        timestamp=$(date "+%Y-%m-%d-%H:%M")
-        mkdir -p $queuedir/${timestamp}
-        rsync -aq $queuedir/bts_version_track/ $queuedir/${timestamp}
-    fi
+    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)