X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=6f7cf0d877b878e4cb2608ae42f096295e2d52f5;hb=e80699c1162ee22906a90717e2195d90b7606497;hp=d66e2348093906cddbee525710896863d2321d36;hpb=3d4f5a474e5550e42c88f30bdc5fd094984dfcc1;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index d66e2348..6f7cf0d8 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -159,7 +159,7 @@ state "Startup"
 
 lockfile -l 3600 "${LOCK_DAILY}"
 trap onerror ERR
-trap cleanup EXIT TERM HUP INT QUIT
+trap remove_daily_lock EXIT TERM HUP INT QUIT
 
 touch "${LOCK_BRITNEY}"
 
@@ -205,6 +205,7 @@ stage $GO
 
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
+trap remove_all_locks EXIT TERM HUP INT QUIT
 
 GO=(
     FUNC="punew"
@@ -381,7 +382,8 @@ GO=(
 )
 stage $GO
 
-remove_locks
+remove_all_locks
+trap - EXIT TERM HUP INT QUIT
 
 ts "locked part finished"
 state "postlock"