From 62526023ab4bb6dda4e8189ca74969497bb3ef09 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 7 Feb 2018 21:06:52 +0100 Subject: bin/build-master-status-from-mysql: do not block on lock failure --- bin/build-master-status-from-mysql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql index 3cacfa1..6ed2e84 100755 --- a/bin/build-master-status-from-mysql +++ b/bin/build-master-status-from-mysql @@ -12,7 +12,10 @@ trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT # always block if locked exec 9> "${build_list_lock_file}" -flock -s 9 +if ! flock -n -s 9; then + >&2 echo 'Mysql-Sanity check skipped, cannot acquire lock.' + exit +fi # shellcheck disable=SC2016 { -- cgit v1.2.3-70-g09d2