From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 15 Aug 2012 20:04:41 +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=f7624a346a5430ff29425204047f45b6291b1de8;hp=291a20c45283cbd70b3d88d4775bdb7ca76f6697;p=dak.git

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

* ansgar/pu/multiarchive-1:
  dak/process_policy.py, daklib/announce.py: fix bugs in new announce code
  dak/process_upload.py: convert exception to string
  dak/process_policy.py: only remove changes entey for rejected uploads
  daklib/announce.py: fix typo

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
 }
 
diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 382dd1a9..80c912f8 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -17,10 +17,6 @@ PROGRAM="Hourly"
 . "${configdir}/common"
 
 dak import-users-from-passwd
-dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
-dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
@@ -30,6 +26,11 @@ if lockfile -r16 $LOCKFILE 2> /dev/null; then
     rm -f $LOCKFILE
 fi
 
+dak queue-report -n > $webdir/new.html
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
+dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+
 cd $webdir
 cat removals-20*.txt > removals-full.txt
 cat removals.txt >> removals-full.txt