X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=c6f1c2d264807639807ac443e7cde307de0f5dc3;hb=f4b7c0f72e2338ac133bc096fe3f4c9fcb4b07fc;hp=18ca14bfb29ce5406d9904d2eee85e16008a6cdf;hpb=4880c97ecd3ad289f1511094f675e93147032caa;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 18ca14bf..c6f1c2d2 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -35,37 +35,42 @@ function wbtrigger() {
 function make_buildd_dir () {
     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
+    ${scriptdir}/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"
+        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/${dist}/buildd
-
-	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
-
-	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
+        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
+        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
@@ -80,15 +85,20 @@ function make_buildd_dir () {
 # Process (oldstable)-proposed-updates "NEW" queue
 function punew_do() {
     local queue="$1"
+    local qdir="$2"
     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
     echo >> REPORT
 
     dak generate-packages-sources2 -s "${queue}"
 
-    local exportdir="${queuedir}/${queue}/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
@@ -97,7 +107,7 @@ function punew() {
         log "Doing automated p-u-new processing"
     fi
     cd "${queuedir}/p-u-new"
-    punew_do "$1"
+    punew_do "$1" "p-u-new"
 }
 
 function opunew() {
@@ -105,7 +115,7 @@ function opunew() {
         log "Doing automated o-p-u-new processing"
     fi
     cd "${queuedir}/o-p-u-new"
-    punew_do "$1"
+    punew_do "$1" "o-p-u-new"
 }
 
 # Do the unchecked processing, in case we have files.
@@ -119,6 +129,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
@@ -126,7 +137,7 @@ function do_new () {
     if [ "${PROGRAM}" = "dinstall" ]; then
 	log "Doing NEW processing"
     fi
-    dak process-policy new | mail -a "X-Debian: DAK" -e -s "NEW processing" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    (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
 }