fix lock removal in dinstall

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index e2dfe7c805e01af3a6ca3573b9996298ddf90464..d275354cc2daf6f7505906a9d628bb2a1b5c8140 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -381,9 +381,7 @@ GO=(
 )
 stage $GO
 
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
-rm -f "${LOCK_DAILY}"
+remove_locks
 
 ts "locked part finished"
 state "postlock"

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 98972e6df0559f845dd4d1d5ffb211040b44965f..605dd2b907cd6b8376d58fd2effea2ddf36b1b00 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -4,10 +4,14 @@ function ts() {
         echo "Archive maintenance timestamp ($1): $(date +%H:%M:%S)"
 }
 
-# Cleanup actions
+# Remove all locks
+function remove_locks() {
+    rm -f $LOCK_DAILY $LOCK_ACCEPTED $LOCK_NEW
+}
+
+# trap handler for cleaning up on signal / error
 function cleanup() {
-       rm -f ${LOCK_DAILY}
-       rm -f ${LOCK_ACCEPTED}
+    remove_locks
 }
 
 # If we error out this one is called, *FOLLOWED* by cleanup above