X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=1616c48f063d4b8dccb0fb3d7f6e36636392d6fe;hb=437c13ce927fbe3254fb63bc162099c831fe9629;hp=9fd9838359e9786c223d6111ef0a9aac12ec7684;hpb=64f709a508e27db13034026b86f0c794b0574da3;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 9fd98383..1616c48f 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -3,11 +3,8 @@
 #
 # Set $PROGRAM to a string to have it added to the output.
 function log () {
-        if [ -z "${PROGRAM}" ]; then
-                echo "$(date +"%b %d %H:%M:%S") $(hostname -s) [$$] $@"
-        else
-                echo "$(date +"%b %d %H:%M:%S") $(hostname -s) ${PROGRAM}[$$]: $@"
-        fi
+        local prefix=${PROGRAM:-}
+        echo "$(date +"%b %d %H:%M:%S") $(hostname -s) ${prefix}[$$]: $@"
 }
 
 # log the message using log() but then also send a mail
@@ -36,16 +33,73 @@ function wbtrigger() {
 
 # used by cron.dinstall *and* cron.unchecked.
 function make_buildd_dir () {
+    # We generate straight into the static mirror location for incoming
     dak manage-build-queues -a
+    dak generate-packages-sources2 -a build-queues
+    dak generate-releases -a build-queues >/dev/null
+
+    # And set up all of the top level symlinks people seem to like
+    find ${incoming}/web -maxdepth 1 -type l -delete
+    dak export-suite -r -s "accepted" -d "$incoming/web"
+
+    # For now, we still create the local incoming.d.o setup
+    ${scriptsdir}/update-buildd-archive ${incoming}/web/debian-buildd ${incoming}/debian-buildd
+    find ${incoming}/public -type l -delete
+    dak export-suite -s "accepted" -d "$incoming/public"
+
+    # Tell the mirrors that we've updated
+    chronic /usr/local/bin/static-update-component incoming.debian.org
+}
+
+# Process (oldstable)-proposed-updates "NEW" queue
+function punew_do() {
+    local queue="$1"
+    local qdir="$2"
+    local to="${3}"
+
+    date -u -R >> REPORT
+    dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" "${to}" -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    echo >> REPORT
+
+    dak generate-packages-sources2 -s "${queue}"
 
-    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
+    STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
 
+    local exportdir="${qdir}/tree/${STAMP}"
+    local targetdir="${qdir}/export"
+    dak export -q "${queue}" -d "${exportdir}" --all
+    ln -sfT ${exportdir} ${targetdir}
+    find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+}
+
+# These versions used in dinstall
+function punew() {
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated p-u-new processing"
+    fi
+    cd "${queuedir}/p-u-new"
+    punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org"
+}
+
+function opunew() {
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated o-p-u-new processing"
+    fi
+    cd "${queuedir}/o-p-u-new"
+    punew_do "$1" "${queuedir}/o-p-u-new" "debian-release@lists.debian.org"
+}
+
+function backports_policy() {
+    local queue="backports-policy"
+    local qdir="/srv/backports-master.debian.org/queue/policy"
+    local to="backports-team@debian.org"
+
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated ${queue} processing"
+    fi
+
+    cd "${qdir}"
+    punew_do "${queue}" "${qdir}" "${to}"
 }
 
 # Do the unchecked processing, in case we have files.
@@ -59,19 +113,19 @@ function do_unchecked () {
 
     echo "$timestamp": ${changes:-"Nothing to do"}  >> $report
     dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
+    dak process-commands -d "$unchecked" >> $report
 }
 
-# Do the newstage processing, in case we have files.
-function do_newstage () {
-    cd $newstage
+# process NEW policy queue
+function do_new () {
+    if [ "${PROGRAM}" = "dinstall" ]; then
+	log "Doing NEW processing"
+    fi
+    (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 
-    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:-""}
+    dak process-policy backports-new | mail -a "X-Debian: DAK" -e -s "NEW processing for backports-new" backports-team@debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 
-    echo "$timestamp": ${changes:-"Nothing to do in newstage"}  >> $report
-    dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$newstage" >> $report
+    dak clean-suites -a new,backports-new
 }
 
 function sync_debbugs () {
@@ -90,13 +144,38 @@ function sync_debbugs () {
     fi
 }
 
+function clean_debbugs () {
+    # Delete files older than 60 days
+    find $queuedir/bts_version_track_archive/ -mtime +60 -type f -delete
+    # Delete empty directories
+    find $queuedir/bts_version_track_archive/ -empty -type d -delete
+}
+
 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
+    dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" backports-team@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
+    dak cruft-report -R > $webdir/cruft-report-daily.txt
+    dak cruft-report -R -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
 }
+
+function pg_timestamp() {
+    tsname=${1:-"unknown"}
+    log "Saving postgres transaction id for ${tsname}"
+    psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S)
+}
+
+function get_archiveroot() {
+    local archivename="$1"
+    local query="SELECT path FROM archive WHERE name='${archivename}'"
+    local archiveroot="$(psql -tAc "${query}")"
+    if [ -z "${archiveroot}" ]; then
+        echo "get_archiveroot: couldn't get archiveroot for '${archivename}'" >&2
+        return 1
+    fi
+    echo "${archiveroot}"
+}