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

diff --git a/config/debian/common b/config/debian/common
index a2f2877a..24ad1dbe 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -33,39 +33,53 @@ 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
+    dak generate-releases -a build-queues >/dev/null
+    ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-buildd
 
-    for suite in unstable experimental; do
-	rm -rf "$incoming/dists/$suite/buildd"
-	dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
+    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/*
+    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/${dist}/buildd
+        cd ${incoming}/dists/${suite}/buildd
+
+        overridesuite=sid
+        if [ "${suite}" = "squeeze-backports" ]; then
+            overridesuite="${suite}"
+        fi
 
-	dpkg-scanpackages . $overridedir/override.sid.all3 >Packages
-	gzip -9c --rsyncable <Packages >Packages.gz
-	dpkg-scansources . $override/override.sid.all3.src >Sources
-	gzip -9c --rsyncable <Sources >Sources.gz
+        apt-ftparchive packages . $overridedir/override.${overridesuite}.all3 >Packages
+        gzip -9c --rsyncable <Packages >Packages.gz
+        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
-	    echo "NotAutomatic: yes" >>Release
-	fi
+        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" -o "${suite}" = "squeeze-backports" ]; 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
+        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
 
-	mv Release Release.gpg buildd/
+        mv Release Release.gpg buildd/
     done
 
+    STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
+
     for dist in $(ls -1 ${incoming}/dists/); do
         # Skip project trace directory
         if [ "${dist}x" = "projectx" ]; then continue; fi
@@ -87,9 +101,13 @@ function punew_do() {
 
     dak generate-packages-sources2 -s "${queue}"
 
-    local exportdir="${queuedir}/${qdir}/export"
-    rm -rf "${exportdir}"
+    STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
+
+    local exportdir="${queuedir}${qdir}/tree/${STAMP}"
+    local targetdir="${queuedir}${qdir}/export"
     dak export -q "${queue}" -d "${exportdir}" --all
+    ln -sfT ${exportdir} ${targetdir}
+    find ${queuedir}${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
@@ -120,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
@@ -128,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 () {
@@ -170,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}"
+}