make the export dir for (o-)p-u-new a bit more atomic

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index be4e54371fff86b77ebaeb8b7bc29ed24f797dd3..d16d2855a8587f6edabbbbcba418a9126881a18f 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"
@@ -89,9 +89,11 @@ function punew_do() {
 
     dak generate-packages-sources2 -s "${queue}"
 
-    local exportdir="${queuedir}/${qdir}/export"
-    rm -rf "${exportdir}"
+    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