X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=24ad1dbef414b872afbee5aa44f9786cb60dc515;hb=2cc15af76b04ff7744d6b31deae32644ae10031f;hp=b1fc190146795959a8d8e3b95d03f54fff288d2c;hpb=22430aa9b94fb9a2a375f661a9ca58eae29b2f61;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index b1fc1901..24ad1dbe 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -33,12 +33,17 @@ function wbtrigger() {
 
 # used by cron.dinstall *and* cron.unchecked.
 function make_buildd_dir () {
+    local overridesuite
+    local suite
+
     dak manage-build-queues -a
     dak generate-packages-sources2 -a build-queues
     dak generate-releases -a build-queues >/dev/null
+    ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-buildd
 
-    for suite in unstable experimental; do
+    for suite in unstable experimental squeeze-backports; do
         rm -rf "$incoming/dists/$suite/buildd"
+        mkdir -p "$incoming/dists/$suite/buildd"
         dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
     done
     rm -f ${incoming}/public/*
@@ -51,15 +56,20 @@ function make_buildd_dir () {
         if [ "${suite}x" = "projectx" ]; then continue; fi
         cd ${incoming}/dists/${suite}/buildd
 
-        apt-ftparchive packages . $overridedir/override.sid.all3 >Packages
+        overridesuite=sid
+        if [ "${suite}" = "squeeze-backports" ]; then
+            overridesuite="${suite}"
+        fi
+
+        apt-ftparchive packages . $overridedir/override.${overridesuite}.all3 >Packages
         gzip -9c --rsyncable <Packages >Packages.gz
-        apt-ftparchive sources . $overridedir/override.sid.all3 >Sources
+        apt-ftparchive sources . $overridedir/override.${overridesuite}.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
+        if [ "$suite" = "experimental" -o "${suite}" = "squeeze-backports" ]; then
             echo "NotAutomatic: yes" >>Release
         fi
 
@@ -128,6 +138,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
@@ -136,7 +147,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" team@backports.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+
+    dak clean-suites -a new,backports-new
 }
 
 function sync_debbugs () {
@@ -178,3 +192,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}"
+}