summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-05-16 23:18:07 +0200
committerJulian Andres Klode <jak@debian.org>2017-05-19 11:18:38 +0200
commit7e65cbfe4a073aa4e433681a8f52a3b87b31f63d (patch)
treeb2d81c6c2f87dce83ed9fd7919d5959317ca0d0f /debian
parent3310f862cba0b997ede8fc4e2d270ab0f6b49e73 (diff)
apt.systemd.daily: Drop the LOCKFD variable
Gbp-Dch: ignore (cherry picked from commit 3819004c2cb3893bfa136f3c44a5783c42cd2a8d)
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/apt.systemd.daily9
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/apt.systemd.daily b/debian/apt.systemd.daily
index d2a0bfbed..0ecbde219 100755
--- a/debian/apt.systemd.daily
+++ b/debian/apt.systemd.daily
@@ -291,17 +291,14 @@ debug_echo()
}
# ------------------------ main ----------------------------
-
-# Maintain a lock on fd 3, so we can't run the script twice at the same
-# time.
-
if [ "$1" = "lock_is_held" ]; then
shift
else
- LOCKFD=3
+ # Maintain a lock on fd 3, so we can't run the script twice at the same
+ # time.
eval $(apt-config shell StateDir Dir::State/d)
exec 3>${StateDir}/daily_lock
- if ! flock -w 3600 $LOCKFD; then
+ if ! flock -w 3600 3; then
echo "E: Could not acquire lock" >&2
exit 1
fi