Merge branch 'merge'

[dak.git] / config / debian / dinstall

diff --git a/config/debian/dinstall b/config/debian/dinstall
index a4244e37a80e760c5e28f0ff7d5435d1748c70d7..4544d0a0daeb256e3ba38a5f2867560cf9c731d3 100755 (executable)
--- a/config/debian/dinstall
+++ b/config/debian/dinstall
@@ -167,9 +167,8 @@ function i18n1() {
 # Process the accepted queue
 function accepted() {
     log "Processing queue/accepted"
-    cd "$accepted"
-    rm -f REPORT
-    dak process-accepted -pa -d /srv/ftp.debian.org/queue/accepted > REPORT
+    rm -f "$accepted/REPORT"
+    dak process-accepted -pa -d "$accepted" > "$accepted/REPORT"
     cat REPORT | mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
     chgrp debadmin REPORT
     chmod 664 REPORT
@@ -385,6 +384,11 @@ function stage() {
     # it has to cd first!
     cd ${configdir}
 
+       if [ -f "${LOCK_STOP}" ]; then
+               log "${LOCK_STOP} exists, exiting immediately"
+               exit 42
+       fi
+
     if [ "${ERR}" = "false" ]; then
         set +e
     fi
@@ -398,6 +402,11 @@ function stage() {
 
     touch "${stagedir}/${FUNC}"
 
+       if [ -f "${LOCK_STOP}" ]; then
+               log "${LOCK_STOP} exists, exiting immediately"
+               exit 42
+       fi
+
     if [ -n "${TIME}" ]; then
         ts "${TIME}"
     fi
@@ -446,6 +455,10 @@ LOCK_ACCEPTED="$lockdir/unchecked.lock"
 # from our point of view
 LOCK_BRITNEY="$lockdir/britney.lock"
 
+# If this file exists we exit immediately after the currently running
+# function is done
+LOCK_STOP="$lockdir/archive.stop"
+
 lockfile -l 3600 "${LOCK_DAILY}"
 trap cleanup EXIT ERR TERM HUP INT QUIT