X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=9fd9838359e9786c223d6111ef0a9aac12ec7684;hb=f0bfd37e7286156598d79b53501ebe2000bb7924;hp=6730889db1805c81f23b7108f7896d089db35a83;hpb=54a1e63df2a81a8f5e6f3148d59afcfeaa7b3495;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 6730889d..9fd98383 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -15,7 +15,7 @@ function log () {
 function log_error () {
         log "$@"
         if [ -z "${MAILTO}" ]; then
-                echo "$@" | mail -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO}
+                echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO}  -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
         fi
 }
 
@@ -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.
@@ -84,9 +78,9 @@ function sync_debbugs () {
     # sync with debbugs
     echo "--" >> $report
     timestamp=$(date "+%Y-%m-%d-%H:%M")
-    mkdir -p $queuedir/${timestamp}
+    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/${timestamp} # remove if empty.
+    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)
@@ -95,3 +89,14 @@ function sync_debbugs () {
         log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
     fi
 }
+
+function reports() {
+    # Send a report on NEW/BYHAND packages
+    log "Nagging ftpteam about NEW/BYHAND packages"
+    dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    # and one on crufty packages
+    log "Sending information about crufty packages"
+    dak cruft-report > $webdir/cruft-report-daily.txt
+    dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
+    cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+}