From b2554880deb779f50aa82e73b247edf3a63b8837 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 31 Jan 2020 09:34:56 +0100
Subject: lib/intentions-queue: make intentions_left() work similar to flock
 and verbose_flock()

---
 bin/copy-to-build-support | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'bin/copy-to-build-support')

diff --git a/bin/copy-to-build-support b/bin/copy-to-build-support
index bb7e421..0dcc298 100755
--- a/bin/copy-to-build-support
+++ b/bin/copy-to-build-support
@@ -77,16 +77,9 @@ verbose_flock -s ${wait_for_lock} 9
 exec 8> "${package_database_lock_file}"
 verbose_flock ${wait_for_lock} 8
 
-if [ -z "${wait_for_lock}" ]; then
-  while intentions_left; do
-    >&2 echo 'There are still intentions in the queue.'
-    sleep 1
-  done
-else
-  if intentions_left; then
-    >&2 echo 'come back (shortly) later - There are still intentions in the queue.'
-    exit 1
-  fi
+if intentions_left ${wait_for_lock}; then
+  >&2 echo 'come back (shortly) later - There are still intentions in the queue.'
+  exit 1
 fi
 
 tmp_dir=$(mktemp -d "${work_dir}/tmp.copy-to-build-support.0.XXXXXXXXXX")
-- 
cgit v1.2.3-70-g09d2