X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=e44f2bb0e468a86dbd0fec8b7227d1b306c82814;hb=4ba12d4b23d87194df5e415f58608b99ab6fd50a;hp=d16d2855a8587f6edabbbbcba418a9126881a18f;hpb=3b976e5c087e2ead1641791b1f8a97174c5574f9;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index d16d2855..e44f2bb0 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -33,67 +33,37 @@ 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
 
-    for suite in unstable experimental; do
-        rm -rf "$incoming/dists/$suite/buildd"
-        dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
-    done
-    rm -f ${incoming}/public/*
-    dak export-suite -s "accepted" -d "$incoming/public"
-
-    # export to old build queue directories
-    # XXX: Remove once the buildds use the version generated above.
-    for suite in $(ls -1 $incoming/dists/); do
-        # Skip project trace directory
-        if [ "${suite}x" = "projectx" ]; then continue; fi
-        cd ${incoming}/dists/${suite}/buildd
-
-        apt-ftparchive packages . $overridedir/override.sid.all3 >Packages
-        gzip -9c --rsyncable <Packages >Packages.gz
-        apt-ftparchive sources . $overridedir/override.sid.all3 >Sources
-        gzip -9c --rsyncable <Sources >Sources.gz
-
-        rm -f buildd/Release
-        cd ..
-        apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release
-        if [ "$suite" = "experimental" ]; then
-            echo "NotAutomatic: yes" >>Release
-        fi
-
-        gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release
+    # Stick a last modified date in the page footer
+    echo "<p>Last updated: `date -u`</p>" > ${incoming}/web/README.html
 
-        mv Release Release.gpg buildd/
-    done
-
-    for dist in $(ls -1 ${incoming}/dists/); do
-        # Skip project trace directory
-        if [ "${dist}x" = "projectx" ]; then continue; fi
-        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
+    # 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}" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    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}"
 
-    local exportdir="${queuedir}${qdir}/tree/${STAMP}"
-    local targetdir="${queuedir}${qdir}/export"
+    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 ${targetdir} ${exportdir}
-    find ${queuedir}${qdir}/tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+    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
@@ -102,7 +72,7 @@ function punew() {
         log "Doing automated p-u-new processing"
     fi
     cd "${queuedir}/p-u-new"
-    punew_do "$1" "p-u-new"
+    punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org"
 }
 
 function opunew() {
@@ -110,7 +80,20 @@ function opunew() {
         log "Doing automated o-p-u-new processing"
     fi
     cd "${queuedir}/o-p-u-new"
-    punew_do "$1" "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.
@@ -124,6 +107,7 @@ 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
 }
 
 # process NEW policy queue
@@ -132,7 +116,10 @@ function do_new () {
 	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
-    dak clean-suites -a new
+
+    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
+
+    dak clean-suites -a new,backports-new
 }
 
 function sync_debbugs () {
@@ -162,6 +149,7 @@ 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 -R > $webdir/cruft-report-daily.txt
@@ -174,3 +162,14 @@ function pg_timestamp() {
     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}"
+}