From d5e3e6b994deaf64eb8e4ffb9c5b3260aa9b5e93 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 18 Sep 2018 10:46:51 +0200
Subject: do not delete lock files

---
 bin/get-assignment        |  1 -
 bin/get-package-updates   |  4 ----
 bin/prioritize-build-list |  4 ----
 bin/return-assignment     | 12 ------------
 bin/seed-build-list       |  2 --
 5 files changed, 23 deletions(-)

diff --git a/bin/get-assignment b/bin/get-assignment
index 328bddc..f670df1 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -89,7 +89,6 @@ if ! verbose_flock -s -n 8; then
 fi
 
 clean_up() {
-  rm -f "${build_list_lock_file}"
   rm -rf --one-file-system "${tmp_dir}"
 }
 
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 5a7af82..18149f9 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -624,7 +624,3 @@ mysql_find_build_assignment_loops
 # remove duplicate binary_packages from "build-list"
 mysql_query_remove_old_binary_packages_from_build_list | \
   mysql_run_query
-
-# Remove the lock file
-
-rm -f "${build_list_lock_file}"
diff --git a/bin/prioritize-build-list b/bin/prioritize-build-list
index f68a559..bcdb67f 100755
--- a/bin/prioritize-build-list
+++ b/bin/prioritize-build-list
@@ -98,7 +98,3 @@ verbose_flock ${wait_for_lock} 8
   else
     cat >&2
   fi
-
-# Remove the lock file
-
-rm -f "${build_list_lock_file}"
diff --git a/bin/return-assignment b/bin/return-assignment
index 191ff3b..8dc47ed 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -68,12 +68,6 @@ if ! verbose_flock -s -n 8; then
   exit 1
 fi
 
-clean_up_lock_file() {
-  rm -f "${build_list_lock_file}"
-}
-
-trap clean_up_lock_file EXIT
-
 if [ "$6" = 'ERROR' ]; then
 # the build failed on the build slave
 
@@ -269,11 +263,6 @@ if ! verbose_flock -n 7; then
   exit 1
 fi
 
-clean_up_lock_file() {
-  rm -f "${build_list_lock_file}"
-  rm -f "${package_database_lock_file}"
-}
-
 # shellcheck disable=SC2016
 build_assignment_id=$(
   {
@@ -337,7 +326,6 @@ fi
 clean_up_tmp_dir() {
   cd "${base_dir}"
   rm -rf --one-file-system "${tmp_dir}"
-  clean_up_lock_file
 }
 
 tmp_dir=$(mktemp -d "${work_dir}/tmp.return-assignment.XXXXXXXXXX")
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 2cced4b..02da05c 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -603,8 +603,6 @@ if ${update}; then
   # remove duplicate binary_packages from "build-list"
   mysql_query_remove_old_binary_packages_from_build_list | \
     mysql_run_query
-
-  rm -f "${build_list_lock_file}"
 else
   cat "${tmp_dir}/update-list"
 fi
-- 
cgit v1.2.3