Ensure we always have when we need it

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index 0bab7bd260ca1c8af1d21e6eb71f825a3a9b3d8f..f3cdaaa35d517648dbb8a683be5504a31bed2b4d 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -35,7 +35,7 @@ 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
 
     for suite in unstable experimental; do
         rm -rf "$incoming/dists/$suite/buildd"
@@ -51,9 +51,9 @@ function make_buildd_dir () {
         if [ "${suite}x" = "projectx" ]; then continue; fi
         cd ${incoming}/dists/${suite}/buildd
 
-        dpkg-scanpackages . $overridedir/override.sid.all3 >Packages
+        apt-ftparchive packages . $overridedir/override.sid.all3 >Packages
         gzip -9c --rsyncable <Packages >Packages.gz
-        dpkg-scansources . $override/override.sid.all3.src >Sources
+        apt-ftparchive sources . $overridedir/override.sid.all3 >Sources
         gzip -9c --rsyncable <Sources >Sources.gz
 
         rm -f buildd/Release
@@ -68,6 +68,8 @@ function make_buildd_dir () {
         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
@@ -89,9 +91,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 ${targetdir} ${exportdir}
+    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