From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 15 Aug 2012 19:23:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=22182e36af2695babeeebe08bd9fcc733f5fd346;hp=1e945c24f59d3e92ef18f456b60aa10210a3113c;p=dak.git

Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge

* ansgar/pu/multiarchive-1:
  rewrite code for sending mails about processed uploads
  dak/process_upload.py: improve error message for ArchiveExceptions and Rejects

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/common b/config/debian/common
index d16d2855..b1fc1901 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -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,10 +91,12 @@ function punew_do() {
 
     dak generate-packages-sources2 -s "${queue}"
 
+    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}
+    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
 }