From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 30 Apr 2009 20:36:55 +0000 (+0200)
Subject: dinstall
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8deab563cb0e0aeaf209e5af90381b6e1f0fa3c9;p=dak.git

dinstall

call unchecked with the -p option, it has to run within the locked area.

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

diff --git a/config/debian/common b/config/debian/common
index f76fb958..5c8171ed 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -71,9 +71,10 @@ function do_unchecked () {
     changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
     report=$queuedir/REPORT
     timestamp=$(date "+%Y-%m-%d %H:%M")
+    UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""}
 
     echo "$timestamp": ${changes:-"Nothing to do"}  >> $report
-    dak process-unchecked -a -d "$unchecked" >> $report
+    dak process-unchecked -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
 }
 
 function sync_debbugs () {
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index dfd9e916..c239c09c 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -403,7 +403,9 @@ function testingsourcelist() {
 
 # do a last run of process-unchecked before dinstall is on.
 function process_unchecked() {
+    log "Processing the unchecked queue"
     acceptnew
+    UNCHECKED_WITHOUT_LOCK="-p"
     do_unchecked
     sync_debbugs
 }